Improve/lengthen some of the spinlocks in the tests