Updated breakpoint parser
Changed tests to reflect the new parser