Fix the callback function name
Add more tests from upstream