Rewrite internals unit-tests to minimize blk.items references