add Enum class, remove enum from Property, and update tests