added test and updated parser