Fixed tests for Travis