Fix test summary table
Fix error in resource recovery logic.
Merge remote-tracking branch 'origin/testing' into testing