Touches up documentation and Model unit test