CSHARP-820 - Test cleanup. Better comments.