CustomProperty progress

Add some test and fixes. More test and fix incoming