Replaced existing property tests with a single one