Merge "Added tests for servers API as per bug/992299"