Improve test coverage local validation