some test code cleanup