added tests for && and ==

plus refactoring
added parentheses to expressions

It helps.