Fix broken tests, add travis-ci support