Fix tests with new callback format