Merge "Revert "Revert "Move most art test off DX"""