Updated tests -- still having problems with connections persisting when
they should't.