Added some basic unit tests for the data model and a few other minor updates