Added properties and tests