fix testament check (use callback instead of return)