Adding CDBI + basic tests.