Ensure that test bindings are always removed