reorganizing structure of unit tests
renaming class