minor fixes and new test cases. Currently, false positives are
suppressed too aggressively.