Added model tests
Removed Schema
Added Tests