More parser fixes and testing