Partially fixed it. DefaultHandlerTest passes.