Cleaning up and adding test file