Are we trying to avoid expect tests and use mockWebServer tests now?