Removed the old CVS tags in the Fortran file headers.
Removed more CVS tags
Modified test for new NDF calculation.