Add tests of models
Merge branch 'Add-tests'

Conflicts:
	Gemfile.lock