Added extra test and made changes to remove false positives on another one.