large chunk of test updates via Simon's update_test script