Attempting to fix some test failures on Travis