fixed issue with stateless callbacks, update unitTest