This PR fixes a couple of issues in the eth test suite that caused flakiness when run in the CI.