Updated tests for travis compatibility