Fix for failing group tests.