Updating all tests to pass in Travis