Remove uses of original_id from test fixtures

Fixes #679