fixing tests, using module const for deliverymode, removing caching of exchanges