Unit test instability fix