Cleanup
Refine optional callback data handling
Improve clientCorrelator handling
Increase wait push timeout to make tests run more smoothly
Cleanup