Better spawn-check for testing.
Revert "Better spawn-check for testing."

This reverts commit f03fef7fe59211c5288b84176e064020546ab24c.