Test groups fix