AUI-1711 Fixing form builder tests