added structure to property
added test cases