Remove some dependencies that were invented. Add a test to make sure the helper exchange type gets unregistered / reregistered correctly.