Some unit test changes.