AUI-1351 - add unit tests