Refactor all testable modules