Added some new unit tests, and updated a view to use the model..