Fixing broken tests
Adding travis-ci