Added test case for product page + improvements