Fix callback
"Integration" tests WIP