Few more tweaks to tests to account for groups containing hostnames