Cleanup/Refactor the tests
Remove unnecessary travis setup