Merge pull request #715 from TheBlueMatt/2020-09-no-rescan-tests