More test fixes

Removed some unnecessary tests now that we don't remap by reference ID
anymore.