Added timing to endpoint shutdowns so that we can figure out which one
that is failing