Fix test cases...