PYTHON-526 - Remaining test fixes.