Added two more test cases, rerunning against the old d2 trees