Merge "Add RecoveryMapMath tests; also some fixes."