Improve fetching product and test case
Code review BTValidateProduct