Updated products model, added unit testing