fixed some minor issues from debugging of tests (mainly in applicationContext.xml and dependencies)