Better comparison and removing 4
Using correct tests
Removing 5