Add more tests for callbacks.
Add more tests.
Merge branch 'release/2.2.0'