Merge test_scpi_utils.c from master