Refactor CDB tests