Adding polished cbrecovery test suite