More changes to ProductContainer and testing