import clean up and test class fix