Updates for unit test.