Fixed some of TokenURLTestCase and TokenMenuTestCase

TokenMenuTestCase needs menu_link_content-related changes but not in this pull
request. I did sneak in a YAML 'entity:' key update though.