Clean up test target naming