Cleaning up test code