update, 6 tests fail due to timing sensitivity, and maybe other factors