Enhance and test IR parser