Reduce recovery priority: fix unit tests