Most updated parser and working unit test cases