Merge "Fix TypeError exception in test_server_actions setup"