Remove redundant tests.
Add also missing ! (not) operation.