Fixing tests to run on travis.