1. DI partitally updated to setter injection instead of field injection
to fix unittests.
1) At last stable maven build with tests