Rename output file more appropriately
Add some printed diagonstics to test shell script
Fix up some EXTRA_DISTs