added merchant and product models/tests