AUI-1194 Adding tests