Update AMI tags used for data17/18 to the reprocessing r-tag.
Fixes ATR-24860 by updating to latest AMI tags for data reprocessing. Also removes a duplicated test (that had a different name).
Fixes ATR-24860 by updating to latest AMI tags for data reprocessing. Also removes a duplicated test (that had a different name).