More test coverage. Fix bad container lookup