Cleaning up tests and adding travis