Fixup tests so they run with the latest threading model