Tests: Make the self-rolled test framework a bit more useful and consistent.