added a few tests, removed a few false positives