Fixing a couple tests that are broken in travis