Pull over some new test programs from the soup-refactoring branch,