SpringDIFactory added, tests refactored.