Add test cases re r=xjia