Fixed the normalizer tests and simplified them at the same time