Continued working on the  test suite. Very nearly finished the model/lib. Added new price class.