Parsing bug fixes
New test code