AUI-1191 Adding tests