Modify some test code