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

...g issues
Agreed this is just an integration test but it consistently brought our envs down for a few days, so I am wary of what we put in here. I am merging however.