Fix WithKeyId after recent PR (#978)

Fixing the session passing around its key ID (which had previously been
blank) exposed another issue which was caught during bats tests:
WithKeyId statements using the wrong key, which prior to now had been
ignored because the argument was empty, resulting in an ineffective
option. This fixes those situations.

It also updates a bats test that didn't get updated in the CLI return
status PR.

internal/tests/cli/boundary/user.bats

@@ -72,13 +72,6 @@ export NEW_USER='test'
   [ "$status" -eq 0 ]
 }
 
-@test "boundary/user: can not delete already deleted $NEW_USER user" {
-  login $DEFAULT_LOGIN
-  local uid=$(user_id $NEW_USER)
-  run delete_user $uid 
-  [ "$status" -eq 1 ]
-}
-
 @test "boundary/users: can not read deleted $NEW_USER user" {
   local uid=$(user_id $NEW_USER)
 	run read_user $uid
@@ -89,10 +82,4 @@ export NEW_USER='test'
   local aid=$(account_id $NEW_USER)
   run delete_account $aid 
   [ "$status" -eq 0 ]
-}
-
-@test "boundary/account/password: can not read deleted $NEW_USER account" {
-  local aid=$(account_id $NEW_USER)
-	run read_account $aid
-	[ "$status" -eq 1 ]
-}
+}