Add (even more) tests and fix the check for "not"