Re #7218. Try to make tests more robust to slow thread startup.
Re #7218. Remove a redundant test.