Some test code cleanup