Refactoring class inheritance hierarchy
Refactoring unit tests to match class inheritance hierarchy