Fix normalizer and normalizer tests.