KRACOEUS-6955: fixing test failures
Merge pull request #492 from leoherbie/spring_test_fix

KRACOEUS-6955: fixing test failures