PYTHON-436 Remove the hacks and fix the tests to work with a Queue instead of a set, now all current tests pass without the hacks