Reenable tests in TestRecovery.java

Various cleanup in the test class