Remove products and fix some tests