Expression parser tested and its logic was optimised. ExpressionParser was covered by tests.