add setter injection
merge ElkContainerTest.java