Improved some variable namings in the test program.