Remove all uses of TestDictionary
Add List to ingest thrift format