further test code cleanup