Add tests for substitution with normalizer