Refactoring + test module