To Issue #261 ADM tests