Updated tests to pass on travis