test and implement removeHook

also, re-organize test for make hook