Now properly closing server instances on a few tests.