Recovery tests fix

Merged Gijs Peskens requested to merge recovery_tests_fix into master

Merge request reports