working on issue #67
fixing typo causing test failures
fixing tests that probably couldn't have worked in the positive case
Merge branch 'paranoia'
merging master in