Updated tests to support travis