Added test for a parsing change, updated code to reflect new changes