ZT: few refactoring in test package and app-context.xml file