Fix TestHandleClass