* fixed one of the group tests and removed more locks