Modify finding from negative, add tests