Test change to properly wait for template instantiation, etc.