More cleanup for test utilities