Parser Fixes and Tests