Fix failing collection model tests; add administrator and manager groups to system_groups