Fix callback context
Add tests