Updated tests for Travis compatibility