tests clean-up and generalization to setupModule