Leave group tests and fixes