Test refactor
Adds mapping of callback for modelEvents, child management API updates