Updates and tests

Adding tests for the parser