More deployment trigger test cleanup