Post model and controller tests.
Merging with master branch