AUI-1346 - Adding tests