I put a number of these items into etc/mtree/BSD.tests2.dist to avoid merge conflicts, but I totally understand why these should go into BSD.tests.dist.