little backflip with the Block, Block again inherits from NamedEntity.
Block now has the Source capabilities of File. According changes to
the tests...