Added tests (failing now)
Adjusted Parser, added unit tests