Minor updates to test program.