Fix unit test after fixing the weird Model::Manager behaviour
Merge branch 'ejhernandez/fix-warn-on-change-id' into ejhernandez/fix-warn-on-change-id-3.4