Fleshed out some more functionality for the parser
Added a test file for the added functions