Fixes for IT

Comparisons were wrong, as they happened
with Enum on one side (old non-DTOs) and String on other (new DTOs)
but were accepted and treated as Object vs Object and
checks failed.