Fix merged test cases