fixing the unit tests to follow some of the model-level changes