Added cleanup from other tests