Improve TestUser group handling