Stop a few tests from running in Valgrind since they time out. Fix the
server shutdown time in other tests.

Change-Id: I5762a0d4856e1d48175398228ced88bc63d9da10