Add system groups to test role map; Refine tests; Initial implementation of collection model