CSHARP-555: Fix some more failing unit tests that the weren't detected for some unknown reason by the NUnit Visual Studio plugin.