removed old model code
new tests functioning