refactor container class tests