Fixing tests that appear to be broken in travis