v3.2.5: Improve test coverage