Fixed tests for travis