Added class tree + test