1. Cook macaroni as directed on package; drain and rinse. Preheat oven to 375 degrees F.
2. Stir celery and olives into macaroni. Place half of the macaroni mixture in an ungreased baking dish, (13-1/2 x 8-3/4 x 1-3/4 inches).
3. Mix tuna, onion, 1 teaspoon salt, 1/4 teaspoon pepper and the cheese. Sprinkle macaroni mixture with half of the tuna mixture; repeat.
4. Melt 2 tablespoons butter in a 2-quart saucepan over low heat; stir in flour, 1/2 teaspoon salt and 1/4 teaspoon pepper. Cook over low heat, stirring constantly, until mixture is smooth and bubbly. Remove from heat. Stir in sour cream and wine. Heat to boiling, stirring constantly.
5. Pour over tuna mixture; dot with 1 tablespoon butter. Cover with aluminum foil and bake 30 minutes. Uncover; bake until golden about 15 minutes.