WIP: add ModelComparator and use it in import tests (not fully working yet)