Haddock with tomatoes and green olives