fixed a coupl test cases