Cleanup test PTE structure and remove variant from shared header#420

Yurlungur merged 3 commits intomainlanl/singularity-eos:mainfrom

jmm/fix-test-get-sg-eoslanl/singularity-eos:jmm/fix-test-get-sg-eosCopy head branch name to clipboard