Added new fields to product and updated tests