AUI-1402 Fixing tests