Add callback requirement, to help order callback calls
Fix tests