Test Fixes - Delete group when is needed