Improvements and testing for Hdata parser