This should probably be done as cleanup actions, instead of as part of tearDown.