Cleanup test and work on .travis file