Clean up test imports