Merge "Correct share group tests cleanup order"