Fixed tests and TravisCI