Updating polished cbrecovery test suite