 
 (defconst finddeclstr1
   (let ((file (concat fs-file-dir "Program.fs")))
-    (format "DATA: finddecl\nfile stored in metadata is '%s'\n%s:1:6\n<<EOF>>\n" file file))
+    (format "{\"Kind\":\"finddecl\",\"Data\":{\"File\":\"%s\",\"Line\":1,\"Column\":6}}\n" file))
   "A message for jumping to a definition in the same file")
 
 (defconst finddeclstr2
   (let ((file (concat fs-file-dir "FileTwo.fs")))
-    (format "DATA: finddecl\nfile stored in metadata is '%s'\n%s:12:11\n<<EOF>>\n" file file))
-    "A message for jumping to a definition in the another file")
+    (format "{\"Kind\":\"finddecl\",\"Data\":{\"File\":\"%s\",\"Line\":12,\"Column\":11}}\n" file file))
+    "A message for jumping to a definition in another file")
 
 (check "jumping to local definition should not change buffer"
   (let ((f (concat fs-file-dir "Program.fs")))

    (should (equal text
                   (concat "Possible incorrect indentation: "
                           "this token is offside of context started at "
                           "position (2:16)."
                           "\nTry indenting this token further or using standard "
                           "formatting conventions.")))))


    ;; with-help-window is a macro and macrolet and labels don't seem to work.
    (stub-fn help-window-setup win
      (fsharp-ac/show-tooltip-at-point)
      (fsharp-ac-filter-output nil tooltip-msg)
      (should-match "fsharp info" (buffer-name (window-buffer win))))))

(check-handler "displays typesig in minibuffer if typesig is requested"
  (stub-fn message sig
    (fsharp-ac/show-typesig-at-point)
    (fsharp-ac-filter-output nil tooltip-msg)
    (should= "foo" sig)))
