Improvements to PropertyParserFunctionTest

Change-Id: I99b4402f7a65e8c4da43dcc3ebf542d8bff27888
Merge "Improvements to PropertyParserFunctionTest"