#4137 Tidy reflector and metamodel tests
#4137 more test tidying