Fix the general type of one and Add more testcases