Fixed tests and Travis CI config