Begin aircraft tests
Begin aircraft tests
Style & conventions cleanup.