Updated tests to help travis