fixed some testcases