Fixing broker extended tests