Consider classifying properties

the old tests shouldnt be removed ;)