Enabled Callbacks to client
Fixing Tests