code review feedback changes and group template validate tests