AUI-995 Adding tests