fix difftool tests
remove CMF dependency in favor of p.ap.contenttypes
fix test asserts for p.a.contenttypes