reorganized classes for tests