Fix tests for Travis-CI build