added test for expanding properties
moved code for expanding to refresh method
Merge branch 'master' into develop