#83 all unit tests for model now pass