[#139] - restructure tests
[#139] - fixed hooks for real