[MIe-805] - Rewrite callback handler to be more concise; adjust unit tests.