AUI-1450 Adding tests