Merge "add tests for server_password"