Merge "Fix exception name in test_server_actions"