Remove the -test suffix from normalize directives
#2172
Merged
-test suffix from normalize directives
#2172