Revert "Test generator to replace thread"

This reverts commit a4a48b9b043e67cfcc347ca7d87fb284c0f93bd4.