Fixing tests and guarding against enable sorcer boot with spawn
Fixing tests and guarding against enable sorcer boot with spawn

s8537/SORCER,mwsobol/SORCER,dudzislaw/SORCER,s13372/SORCER,dudzislaw/SORCER,dudzislaw/SORCER,mwsobol/SORCER,s13372/SORCER,s8537/SORCER,mwsobol/SORCER,s13372/SORCER,s8537/SORCER