minor cleanup of test code