Added setup and teardown for tests