Merge pull request #716 from TheBlueMatt/2020-09-fee-tests