CSPACE-6273: More refinement of template, test, user.pp module.