modify some unit tests