Add a missing 'inlineCallbacks' decorator
Remove unused test method
Remove unused import.
Merge pull request #1404 from benallard/test_cleanup

Test cleanup