Cleanup and adding file necessary for test