added template groups and tests