Incorporated review comments for group resource functional tests