Added parser and test classes for add and or.