#72 added AdxDi with tests