Repaired the tests.
Restored the spawn option; added configuration to the mock.