Unit test changes.