Adds more UT coverage.