Merge "Unit tests: Fix unit test description strings."