Fixing a couple tests