Intermediate checkin of DefaultRequestHandlerTest. Still not passing.