Fixed callback conflict with the new API

Updated unit tests