Cleans up greenlets in tests
Merge pull request #1853 from lukecampbell/greenlets

TEST - Cleans up greenlets in tests