Merge "Add an extra set of test cases for libpropertyinfoparser"