KRACOEUS-7344: converting to DOS to help troubleshoot test for s2s generator
KRACOEUS-7344: removing 'and'
Merge pull request #532 from leoherbie/KRACOEUS-7344_dos

KRACOEUS-7344: converting to DOS to help troubleshoot test for s2s gener...