Added setup and teardown support