All tests for parsing are implemented, but the tests don't run because the behavior for the parser isn't implemented. Will do for next commit.
Merge remote-tracking branch 'origin/master'