fixing bug with AzureServiceBus and adding UT