KRACOEUS-8097:fixing broken tests
Merge pull request #952 from jwillia/KRACOEUS_8097_3

KRACOEUS-8097:fixing broken tests