Fixing two bad tests