modified interface, readjusted test programs