Adjustments to tests, some refactoring
Experimenting with consolidated base moduled to see if I can just load
one module instead of a bunch every time.  Working thorugh some export
issues.