Add more testcases #29