Added some tests to parser