Small improvements to the test code.