added some more hierarchy classes and tests