3.x

A few fixes that improve the test suite