Update test cases and fix normalize for specific cases.