a small clean up of test code