Updated DAP Tests