Making this work better in support of testing.

We are working with the installation scripts to serve up a better
development environment for the generation of tests.