Merge pull request #1317 from TheBlueMatt/2022-02-fix-bunk-test