Fixed tests for callback changes for #860