reorder to fix warning about m4 directory.
test code clean up and output.