Updated tests for models that changed