* restructured group tests