Check if there is a superentity, fix broken test