refs #6820 - forgot to pass the block to sub-trees
refs #6820 - fixing tests