Fixing bugs in product controller
Merge admin_product_testing