AUI-972 Adding tests