MOD: Modified the structure of the parsing and added a test.