added test cleanup