Changed behaviour of setup/teardown.