Tested: added more tests
Merge branch 'esAdaptorAsConstructorDependency'