fix ToProperties test
change access modifier
refactor api for EnablePropertySource support