v3.2.2 Improve code coverage