BS-8046
Fix test + fix bug in product