anchor.diff:      ok = test_verify_tuples([PIDF_XML2_Tuple1], ParseCT_Tuples2),
   
       autotest:mark(?LINE, "set_pidf_for_user/4 - 3"),
  -    %% test same etag
  -    {error, etag_already_exists} = set_pidf_for_user(SPFU_User1, SPFU_ETag2, 5, "application/pidf+xml", PIDF_XML2, #event_ctx{}),
  -
  -
  -    %% refresh_pidf_user_etag(User, ETag, Expires, NewETag)
  +    %% test same etag, and also test max Expires value
  +    {error, etag_already_exists} =
  +	set_pidf_for_user(SPFU_User1, SPFU_ETag2, ?EXPIRES_UPPER_LIMIT, "application/pidf+xml",
  +			  PIDF_XML2, #event_ctx{}),
  +
  +    autotest:mark(?LINE, "set_pidf_for_user/4 - 4.1"),
  +    %% test out of bounds Expires
  +    {error, expires_out_of_bounds} =
  +	set_pidf_for_user(SPFU_User1, SPFU_ETag2, ?EXPIRES_LOWER_LIMIT - 1, "application/pidf+xml",
  +			  PIDF_XML2, #event_ctx{}),
  +
  +    autotest:mark(?LINE, "set_pidf_for_user/4 - 4.2"),
  +    %% test out of bounds Expires
  +    {error, expires_out_of_bounds} =
  +	set_pidf_for_user(SPFU_User1, SPFU_ETag2, ?EXPIRES_UPPER_LIMIT + 1, "application/pidf+xml",
  +			  PIDF_XML2, #event_ctx{}),
  +
  +
  +    %% refresh_pidf_user_etag(User, ETag, NewExpires, NewETag)
       %%--------------------------------------------------------------------
       autotest:mark(?LINE, "refresh_pidf_user_etag/4 - 1.1"),
       %% update first entry from previous test with new expires-time
  
positive.code: %% Descrip.: Parse and store an PIDF XML associated with a presentity.
  %% Returns : ok | {error, Reason}
  %%--------------------------------------------------------------------
  set_pidf_for_user(User, ETag, Expires, ContentType, XML, Ctx) when is_list(User), is_list(XML),
  								   is_record(Ctx, event_ctx) ->
      case parse_pidf_xml(ContentType, XML) of
  
negative.code: 
      DE_User1 = "__test_expired_user1__",
      DE_ETag1 = "test-" ++ "-" ++ integer_to_list(ExpiredNow) ++ "::" ++ integer_to_list(?LINE),
      %% not-expired entry
      ok = set_pidf_for_user(DE_User1, DE_ETag1, 5, "application/pidf+xml", PIDF_XML2, #event_ctx{}),
  
      DE_ETag2 = "test-" ++ "-" ++ integer_to_list(ExpiredNow) ++ "::" ++ integer_to_list(?LINE),
      %% expired entry
      ok = set_pidf_for_user(DE_User1, DE_ETag2, -1, "application/pidf+xml", PIDF_XML2, #event_ctx{}),
  
      autotest:mark(?LINE, "delete_expired/0 - 1"),
  