test cases, fix