Code cleanup and make the test.txt inline with the NPARA detection.