Fixed mutiple testcases