Fixed more tests cases.