Container refinement & tests