more property sugar, update tests