AUI-1369 - Adding test