Fix tests for Travis