last testcases to fix