shutdown aggressively, fix tests