Testing in progress.
Block_parse now sets the input file.
Merge branch 'master' into children_specification_enhancement
Tests seem ok.