Cleaning up and testing on linux