Fix up unit tests for models