Group test factory updated