XD-1536 Followup: Fix shell test