AUI-1630 Unit test