Wrapup of changes to help build and distribute more test files.

This is a new branch in which I just cherry-picked the important changes.  If this is accepted, I will then go
back to reorganizing my repo.