Setup travis-ci and fix tests

55f5c6d break tests