Refactor and fixed property test data shrinking