Bugfix (tc023, tc026, tc027) with substitution according to new specs (groups and members keywords removed)