Adding final modifications to Heterogenius tree and its test cases.