Merge "Move recovery_test.cpp out of unit test"