Replace unwanted data.originX['type'] in tests
This prepares the removal of origin['type'], again.
Test Plan
tox
Migrated from D2170 (view on Phabricator)
Staging instance, all changes can be removed at any time
This prepares the removal of origin['type'], again.
tox
Migrated from D2170 (view on Phabricator)