CDB-1692 Tests cleanup