Accommodate async DB saves so tests pass