Merge branch 'updatingSpawner' into cimporter
Merge branch 'cimporter' of https://github.com/mbeddr/mbeddr.core into cimporter
minor changes to testfiles