Small refactoring in JinniParser class.
Add test case for JinniParser test