Fix bugs in FeatureSupport tests and improve shutdown between tests.