Fix flaky specs: create_spec.rb[1:12:3:2:1] and switch_types_spec.rb[1:1:2]

Fix flaky specs: create_spec.rb[1:12:3:2:1] and switch_types_spec.rb[1:1:2] #31700