added more properties and tests