KRACOEUS-7899: fixing test and also fixing several new spring bean config issues
Merge pull request #752 from leoherbie/KRACOEUS-7899

KRACOEUS-7899: fixing test and also fixing several new spring bean confi...