Never mind, I've merged, making this update locally along with some other test idiom updates.