removed debugging code + fixed teardown.