Clean up test helpers