Add ui test case, fix for delete and some other fixes