Added product test coverage
Some fixs found out after tests products