Tidy-up digest collection and typo in tests