fixed issues in test cases