Fix Handler Tests