Module and test refactoring.