Work on unit tests for parser