Fix for callback tests