Changed shell+tests to use container-cdi