many fixes, tree now builds itself (tests add themselves to a context)