Make the test feel a bit better
Add PropertyPathHandler