Tests working after name shuffle