Tweaked grammar
Added parser tests
Added parser