Added support for add/cat to grammar, with corresponding test cases