KRACOEUS-6955: fixing test failures
KRACOEUS-7401
Merge pull request #481 from shibupolus/KRACOEUS-7401

KRACOEUS-7401
Merge pull request #492 from leoherbie/spring_test_fix

KRACOEUS-6955: fixing test failures