Fixing tests and guarding against NPEs
Merge branch 'master' of https://github.com/mwsobol/SORCER