Fix the bug related to locations as property source resources.

Fix the bug related to locations as property source resources. Updated test case to cover this.