add groups, subjects, including model & controller tests