Add skip guards for property tests