ENG-6229 Fixed a number of issues with the test and added a group field for more test flexibility