Fix tests and update mapstructure

http/sys_rotate_test.go

@@ -21,11 +21,30 @@ func TestSysRotate(t *testing.T) {
 
 	var actual map[string]interface{}
 	expected := map[string]interface{}{
+		"lease_id":       "",
+		"renewable":      false,
+		"lease_duration": json.Number("0"),
+		"wrap_info":      nil,
+		"warnings":       nil,
+		"auth":           nil,
+		"data": map[string]interface{}{
+			"term": json.Number("2"),
+		},
 		"term": json.Number("2"),
 	}
+
 	testResponseStatus(t, resp, 200)
 	testResponseBody(t, resp, &actual)
-	delete(actual, "install_time")
+
+	actualInstallTime, ok := actual["data"].(map[string]interface{})["install_time"]
+	if !ok || actualInstallTime == "" {
+		t.Fatal("install_time missing in data")
+	}
+	expected["data"].(map[string]interface{})["install_time"] = actualInstallTime
+	expected["install_time"] = actualInstallTime
+
+	expected["request_id"] = actual["request_id"]
+
 	if !reflect.DeepEqual(actual, expected) {
 		t.Fatalf("bad:\nexpected: %#v\nactual: %#v", expected, actual)
 	}