Improve UT coverage.