Redid tests again, they exit cleanly now.