address classifier
  - test refactoring