AUI-1156 - Fix tests