Improved callback spec. Fix error when skipping a callback