Added Spring Dependency Injection and tests