configuration restructuring.
reenable teardown.