refactor domain-test module, new module added