Various uninteresting changes to the test programs.