[BACKLOG-1138] Cleanup thin model
Merge pull request #1 from mdamour1976/cleanup

Cleanup
Fixed unit tests.