Again unimportant renames
Two failed tests added