Make spec more rigorous.
Merge pull request #9 from jdutil/fix_soft_mode

Make spec more rigorous.