AUI-1158 - Adding test