Separator
Refactor
Decrease number of property tests