Add leaf set property tests and associated fixes
Merge branch 'add-leaf-set-property-test'