Fixing tests in preperation for Travis CI build.