AUI-1388 - Adding test