Add proper
Property test most of the things