Small unit test changes.