More work on making the test code look better