Add a couple more missing items/blocks.  Fix Material test so it ignores
technical blocks, and deprecated blocks.