Fixing MockWebServer and Unit Tests