fix broken test cases...