trying to reduce number of inputs
Fixed a few tests, and yes-no responses