v3.2.3: Improve test coverage