[CM] some s7test.scm patches

[bil at ccrma.Stanford.EDU]

Thanks -- I have merged those changes into my versions.
(two of the ffitest.c changes appear to be just indentation,
so I omitted them).