Add the test trees that were supposed to be part of r199632.