[1.7.x] Cleanup failing test w/contenttypes and remove useless graph load