Updated tests to be compatible with Travis CI