Adding more tests to parser