Modify some tests