v3.2.4: Improve test coverage