Fix more of ProductContainer tests