Fix up the deffile sections for test, environment and runscript
Fix up the deffile sections for test, environment and runscript

Trophime/singularity,Trophime/singularity,Trophime/singularity,Trophime/singularity