hier classification refactoring, removed juint4 tests