Added more testcases