Merge "Fix string_to_num_test"