Fixed tests for travis build