BF: uncommenting test clean-up (TODO: move to setup/teardown)