Fix very silly bug in discovery and appear to have teardown working