Fixed failing Group tests