fixed added more BNFParser test cases & fixed parser