Add support for D - tests