Add tests for the models
Cleanup of views