Updated tests for travis-ci