Refactored a lot of code.
Added functionality to Inject Test Beans as test method parameters.