Refactored grammars to use an extra rule, which removes the need for a separate expression parser
Added parser tests