Removing hardcoding in Grouped Condition and changing test accordingly