Clean up test encoding