More minor test code cleanup