re-added domain classes for tests