Fix a couple of debug info test cases to match the metadata schema change in r216239

Found these while testing something else.