Unit test polish.