AUI-1450 Fixing tests