Minor cleanup of test code