Refactor of ProductContainer to simplify accessors
New tests for ProductContainer added