Merge "Tidy up MockWebServer usage"