Little refactoring in HierClass
exp: SPOC and Hier tests refactoring