Last minute fixes, recovery mode in TEST_FINITE seems to work now