Fix some test cases and add debug code for result processing.