Update to the callback registration contract code and update callback test contract repo#497