AUI-1577 Added more test cases