Fix #/parameter mismatch
Improve Sawtooth test