AUI-1138 Adding tests