Remove Hooks and add Unit and Kernel tests