updating tests to for nil
Property.or_search, plus test