Reviewer Felix: Do database accesses in parallel where possible

Make the DB accesses go in parallel where possible.  The complexity of the change is almost entirely in the UTs, which are, sadly, less readable as a result.