Fixed tests for Travis compatibility