Rich Macaroni & Tomato Bake