Issue #45: Unit tests for model.py extended