Fix for broker extended tests