Yet another blind commit to try and fix a Mac / Java threading bug which happens intermittently while running the tests.