[cvs-nhc98] cvs commit: cpphs/tests expect21 expect22