Fixes for parse_test to accomodate new Block location.