Refactor to #1138#1141

marioevz merged 4 commits intoethereum:7685-no-dataethereum/execution-spec-tests:7685-no-datafrom

marioevz:7685-no-datamarioevz/execution-spec-tests:7685-no-dataCopy head branch name to clipboard