fix the TestHandler