removing module hooking
an idea
updating tests
fixing after rebase