Modify some unit tests.