A little cleanup of test code