more progress on model development / unit tests - unit tests are currently in a shambles