added program7 to the unitest suite and tidy things up