Fix coverage package
Basic model structure with all subclasses but without any fancy stuff
Docstrings for tests
Merge branch 'master' into model