statics were obviously wrong -- may be multiple instantiations of any given module. Extend test to cover this.
Naming and use of statics to be possibly revised.