test code cleanup