Fix tests to work on travis