AUI-1274 - Adding test