refactor test module / dependency structure