Clean up related to test1 and refactoring