Tidy up test setup