Merge pull request #1481 from TheBlueMatt/2022-05-new-chain-tests