refactor container core tests