Cleans up greenlets in test
Merge pull request #1854 from lukecampbell/greenlets-r2

TEST - Cleans up greenlets in test R2