Clean up controller client in test
Merge pull request #6750 from bstansberry/close-test-leak

Clean up controller client in test