Fix hook construction + Add more tests