Also pass Client to callback

Makes it possible to inspect other possible connections
Update changes.txt and add rudimentary test for callback additions
Merge changes.txt conflicts