(Issue 303) Fix intermittent test failures for group indexing test