Changes to unit tests.