Refactor normalizer tests