Modify some things in the test code