Improve test
Refactor to explicit callbacks/errbacks