fixed all testcases again