Some refactoring in the property tests