Fixing extended broker tests