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