Remove price points
Add new testcases
Refactor models and add utils
Add new manufacturer model test