Tweaked the expiration test a bit; was failing if the database took too long to respond.