fixed couple testcases