Added unittests for parser