Improve UT coverage