Fixed broken testcases