Added proxy cleanup to avoid test failures when randomized spec order is used.