significant refactoring

test/provided/required files no longer hard-coded.  other misc improvements.