AUI-1615 Adding tests