Fix minor bugs in server start/kill tests