Fix two tests broken by removal of StringToNumberConverter (#12092)

Change-Id: Ic1520ddf670d83ce804acf240067c85d493196ca