Fixed some testcases