Minor test refacturing
Enhanced test group hierarchy
More test groups
Fixes for mixed mc_include mc_exclude
 - resolve most specific env