Folded in test suite updates.