Updated tests and updated parser