Updated the tests to pass through travis.