Updated tests to be more travis-friendly