Refactored models and added unit tests for simpler models
Fixed views after model refactor