Add a full program test.  Remove the previous one.