Refactored ANTLR grammar to support properties,constants and nested expressions constants on both sides of logic expressions.
Corrected some bad tests that revealed themselves after the refactor