LOADUI-1093 Fixing broken tests