[Feature-HMount, HCluster] more tests and refactorings