fix: bounty tests, superceeds #799#1112

nventuro merged 2 commits intoOpenZeppelin:masterOpenZeppelin/openzeppelin-contracts:masterfrom

shrugs:fix/bounty-testsshrugs/openzeppelin-solidity:fix/bounty-testsCopy head branch name to clipboard