Fix a bunch of deprecation warnings spotted when running tests

I took some time to remove the numerous deprecation warnings that were cluttering the pytest output.

This notably removes all the warnings related to comparing a ModelObjectType enum with a string literal.

As a consequence ModelObjectType enums are used as dict keys instead of literal strings.