re-refactor test module / dependency structure

Simplify: it was a nice try but the result was unnecessarily complex