Added ability to parse function calls as well as unit tests for function
calls