Added testcases
Modified testcases and lexer.
Merge branch 'master' of github.com:ArjanO/AP-NLP