Merge in error for expiration for delete, and test update