#4137 Tidy reflector and metamodel tests