AUI-1643 Unit Test