Removed beans
Removed beans
Introduced Spring beans and fixed tests...
Introduced Spring beans and fixed tests...