fixed even more testcases