Tree structure built, tests added