FIXUP: Update tests for callback changes.

Note: this commit should be squashed with 80bbe0e0057fefc9773b3bd554be93f0ba2fa1a9