Changing Test Names to Keys - Done