diff --git a/src/syntax/latex/analysis/distro_file.rs b/src/syntax/latex/analysis/distro_file.rs
index f5a477e7..4c747ce7 100644
--- a/src/syntax/latex/analysis/distro_file.rs
+++ b/src/syntax/latex/analysis/distro_file.rs
@@ -57,15 +57,15 @@ mod tests {
             .insert("bar.tex".into(), "/distro/bar.tex".into());
 
         assert_eq!(
-            analyze_distro_file(&resolver, "foo", &["tex"]),
+            resolve_distro_file(&resolver, "foo", &["tex"]),
             Some(Uri::from_file_path("/distro/foo.tex").unwrap())
         );
 
         assert_eq!(
-            analyze_distro_file(&resolver, "foo", &["sty"]),
+            resolve_distro_file(&resolver, "foo", &["sty"]),
             Some(Uri::from_file_path("/distro/foo.sty").unwrap())
         );
 
-        assert_eq!(analyze_distro_file(&resolver, "foo", &["cls"]), None);
+        assert_eq!(resolve_distro_file(&resolver, "foo", &["cls"]), None);
     }
 }
diff --git a/tests/integration/common.rs b/tests/integration/common.rs
index fbac1672..514cdae7 100644
--- a/tests/integration/common.rs
+++ b/tests/integration/common.rs
@@ -12,7 +12,7 @@ use lsp_server::{Connection, RequestId};
 use lsp_types::{notification::Notification, request::Request, *};
 use rustc_hash::FxHashMap;
 use tempfile::{tempdir, TempDir};
-use texlab::{Options, Server};
+use texlab::Server;
 use unindent::unindent;
 
 pub struct ServerTester {
@@ -257,18 +257,18 @@ impl ServerTester {
         Ok(symbols)
     }
 
-    pub fn change_configuration(&self, options: Options) -> Result<()> {
-        self.client.sender.send(
-            lsp_server::Notification::new(
-                notification::DidChangeConfiguration::METHOD.to_string(),
-                DidChangeConfigurationParams {
-                    settings: serde_json::to_value(options)?,
-                },
-            )
-            .into(),
-        )?;
-        Ok(())
-    }
+    // pub fn change_configuration(&self, options: Options) -> Result<()> {
+    //     self.client.sender.send(
+    //         lsp_server::Notification::new(
+    //             notification::DidChangeConfiguration::METHOD.to_string(),
+    //             DidChangeConfigurationParams {
+    //                 settings: serde_json::to_value(options)?,
+    //             },
+    //         )
+    //         .into(),
+    //     )?;
+    //     Ok(())
+    // }
 }
 
 impl Drop for ServerTester {
diff --git a/tests/integration/completion.rs b/tests/integration/completion.rs
index 8201f3f1..33af77f0 100644
--- a/tests/integration/completion.rs
+++ b/tests/integration/completion.rs
@@ -183,7 +183,6 @@ mod bibtex {
 mod latex {
     use insta::assert_json_snapshot;
     use lsp_types::ClientCapabilities;
-    use texlab::Options;
 
     use super::*;
 
@@ -554,142 +553,6 @@ mod latex {
         Ok(())
     }
 
-    #[test]
-    fn test_include_relative_root_no_extension() -> Result<()> {
-        let server = ServerTester::launch_new_instance()?;
-        server.initialize(ClientCapabilities::default(), None)?;
-        let uri = server.open(
-            "main.tex",
-            r#"
-                \documentclass{article}
-                \include{}
-                \input{}
-                \input{qux/}
-                \addbibresource{}
-            "#,
-            "latex",
-            true,
-        )?;
-        server.open("foo.bib", "", "bibtex", true)?;
-        server.open("bar.tex", "", "latex", true)?;
-        server.open("qux/baz.tex", "", "latex", true)?;
-        assert_json_snapshot!(complete_and_resolve(&server, uri, 1, 9)?);
-        Ok(())
-    }
-
-    #[test]
-    fn test_include_relative_root_with_extension() -> Result<()> {
-        let server = ServerTester::launch_new_instance()?;
-        server.initialize(ClientCapabilities::default(), None)?;
-        let uri = server.open(
-            "main.tex",
-            r#"
-                \documentclass{article}
-                \include{}
-                \input{}
-                \input{qux/}
-                \addbibresource{}
-            "#,
-            "latex",
-            true,
-        )?;
-        server.open("foo.bib", "", "bibtex", true)?;
-        server.open("bar.tex", "", "latex", true)?;
-        server.open("qux/baz.tex", "", "latex", true)?;
-        assert_json_snapshot!(complete_and_resolve(&server, uri, 2, 7)?);
-        Ok(())
-    }
-
-    #[test]
-    fn test_include_relative_sub_directory() -> Result<()> {
-        let server = ServerTester::launch_new_instance()?;
-        server.initialize(ClientCapabilities::default(), None)?;
-        let uri = server.open(
-            "main.tex",
-            r#"
-                \documentclass{article}
-                \include{}
-                \input{}
-                \input{qux/}
-                \addbibresource{}
-            "#,
-            "latex",
-            true,
-        )?;
-        server.open("foo.bib", "", "bibtex", true)?;
-        server.open("bar.tex", "", "latex", true)?;
-        server.open("qux/baz.tex", "", "latex", true)?;
-        assert_json_snapshot!(complete_and_resolve(&server, uri, 3, 11)?);
-        Ok(())
-    }
-
-    #[test]
-    fn test_include_relative_parent_dir() -> Result<()> {
-        let server = ServerTester::launch_new_instance()?;
-        server.initialize(ClientCapabilities::default(), None)?;
-        server.open(
-            "main.tex",
-            r#"
-                \documentclass{article}
-                \include{}
-                \input{}
-                \input{qux/}
-                \addbibresource{}
-            "#,
-            "latex",
-            true,
-        )?;
-        server.open("foo.bib", "", "bibtex", true)?;
-        server.open("bar.tex", "", "latex", true)?;
-        let uri = server.open("qux/baz.tex", r#"\input{../}"#, "latex", true)?;
-        assert_json_snapshot!(complete_and_resolve(&server, uri, 0, 10)?);
-        Ok(())
-    }
-
-    #[test]
-    fn test_include_relative_bibliography() -> Result<()> {
-        let server = ServerTester::launch_new_instance()?;
-        server.initialize(ClientCapabilities::default(), None)?;
-        let uri = server.open(
-            "main.tex",
-            r#"
-                \documentclass{article}
-                \include{}
-                \input{}
-                \input{qux/}
-                \addbibresource{}
-            "#,
-            "latex",
-            true,
-        )?;
-        server.open("foo.bib", "", "bibtex", true)?;
-        server.open("bar.tex", "", "latex", true)?;
-        server.open("qux/baz.tex", "", "latex", true)?;
-        assert_json_snapshot!(complete_and_resolve(&server, uri, 4, 16)?);
-        Ok(())
-    }
-
-    #[test]
-    fn test_include_relative_root_directory() -> Result<()> {
-        let server = ServerTester::launch_new_instance()?;
-        server.initialize(ClientCapabilities::default(), None)?;
-        server.change_configuration(Options {
-            root_directory: Some(".".into()),
-            ..Options::default()
-        })?;
-
-        let uri = server.open(
-            "src/main.tex",
-            r#"
-                \input{}
-            "#,
-            "latex",
-            true,
-        )?;
-        assert_json_snapshot!(complete_and_resolve(&server, uri, 0, 7)?);
-        Ok(())
-    }
-
     #[test]
     fn test_label() -> Result<()> {
         let server = ServerTester::launch_new_instance()?;
diff --git a/tests/integration/snapshots/integration__completion__latex__citation_valid.snap b/tests/integration/snapshots/integration__completion__latex__citation_valid.snap
deleted file mode 100644
index 7fc0038b..00000000
--- a/tests/integration/snapshots/integration__completion__latex__citation_valid.snap
+++ /dev/null
@@ -1,66 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, tex_uri, 3, 6)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "foo:2019",
-      "kind": 1,
-      "documentation": {
-        "kind": "markdown",
-        "value": "Bar, F. (2019). *Baz Qux*."
-      },
-      "preselect": false,
-      "sortText": "00 foo:2019 @articlefoo:2019 author Foo Bar title Baz Qux year 2019",
-      "filterText": "foo:2019 @articlefoo:2019 author Foo Bar title Baz Qux year 2019",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 3,
-            "character": 6
-          },
-          "end": {
-            "line": 3,
-            "character": 6
-          }
-        },
-        "newText": "foo:2019"
-      },
-      "data": {
-        "citation": {
-          "key": "foo:2019",
-          "uri": "file:///C:/Users/Paddy/AppData/Local/Temp/.tmpYceZfP/main.bib"
-        }
-      }
-    },
-    {
-      "label": "bar:2005",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "01 bar:2005 @articlebar:2005",
-      "filterText": "bar:2005 @articlebar:2005",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 3,
-            "character": 6
-          },
-          "end": {
-            "line": 3,
-            "character": 6
-          }
-        },
-        "newText": "bar:2005"
-      },
-      "data": {
-        "citation": {
-          "key": "bar:2005",
-          "uri": "file:///C:/Users/Paddy/AppData/Local/Temp/.tmpYceZfP/main.bib"
-        }
-      }
-    }
-  ]
-}
diff --git a/tests/integration/snapshots/integration__completion__latex__include_relative_bibliography.snap b/tests/integration/snapshots/integration__completion__latex__include_relative_bibliography.snap
deleted file mode 100644
index 4940199e..00000000
--- a/tests/integration/snapshots/integration__completion__latex__include_relative_bibliography.snap
+++ /dev/null
@@ -1,48 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, uri, 4, 16)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "foo.bib",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "00",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 4,
-            "character": 16
-          },
-          "end": {
-            "line": 4,
-            "character": 16
-          }
-        },
-        "newText": "foo.bib"
-      }
-    },
-    {
-      "label": "qux",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "01",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 4,
-            "character": 16
-          },
-          "end": {
-            "line": 4,
-            "character": 16
-          }
-        },
-        "newText": "qux"
-      }
-    }
-  ]
-}
diff --git a/tests/integration/snapshots/integration__completion__latex__include_relative_parent_dir.snap b/tests/integration/snapshots/integration__completion__latex__include_relative_parent_dir.snap
deleted file mode 100644
index 112234f1..00000000
--- a/tests/integration/snapshots/integration__completion__latex__include_relative_parent_dir.snap
+++ /dev/null
@@ -1,67 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, uri, 0, 10)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "bar.tex",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "00",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 0,
-            "character": 10
-          },
-          "end": {
-            "line": 0,
-            "character": 10
-          }
-        },
-        "newText": "bar.tex"
-      }
-    },
-    {
-      "label": "main.tex",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "01",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 0,
-            "character": 10
-          },
-          "end": {
-            "line": 0,
-            "character": 10
-          }
-        },
-        "newText": "main.tex"
-      }
-    },
-    {
-      "label": "qux",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "02",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 0,
-            "character": 10
-          },
-          "end": {
-            "line": 0,
-            "character": 10
-          }
-        },
-        "newText": "qux"
-      }
-    }
-  ]
-}
diff --git a/tests/integration/snapshots/integration__completion__latex__include_relative_root_directory.snap b/tests/integration/snapshots/integration__completion__latex__include_relative_root_directory.snap
deleted file mode 100644
index d752fca7..00000000
--- a/tests/integration/snapshots/integration__completion__latex__include_relative_root_directory.snap
+++ /dev/null
@@ -1,29 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, uri, 0, 7)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "src",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "00",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 0,
-            "character": 7
-          },
-          "end": {
-            "line": 0,
-            "character": 7
-          }
-        },
-        "newText": "src"
-      }
-    }
-  ]
-}
diff --git a/tests/integration/snapshots/integration__completion__latex__include_relative_root_no_extension.snap b/tests/integration/snapshots/integration__completion__latex__include_relative_root_no_extension.snap
deleted file mode 100644
index 13c6ca30..00000000
--- a/tests/integration/snapshots/integration__completion__latex__include_relative_root_no_extension.snap
+++ /dev/null
@@ -1,67 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, uri, 1, 9)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "bar",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "00",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 1,
-            "character": 9
-          },
-          "end": {
-            "line": 1,
-            "character": 9
-          }
-        },
-        "newText": "bar"
-      }
-    },
-    {
-      "label": "main",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "01",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 1,
-            "character": 9
-          },
-          "end": {
-            "line": 1,
-            "character": 9
-          }
-        },
-        "newText": "main"
-      }
-    },
-    {
-      "label": "qux",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "02",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 1,
-            "character": 9
-          },
-          "end": {
-            "line": 1,
-            "character": 9
-          }
-        },
-        "newText": "qux"
-      }
-    }
-  ]
-}
diff --git a/tests/integration/snapshots/integration__completion__latex__include_relative_root_with_extension.snap b/tests/integration/snapshots/integration__completion__latex__include_relative_root_with_extension.snap
deleted file mode 100644
index 4b688caa..00000000
--- a/tests/integration/snapshots/integration__completion__latex__include_relative_root_with_extension.snap
+++ /dev/null
@@ -1,67 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, uri, 2, 7)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "bar.tex",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "00",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 2,
-            "character": 7
-          },
-          "end": {
-            "line": 2,
-            "character": 7
-          }
-        },
-        "newText": "bar.tex"
-      }
-    },
-    {
-      "label": "main.tex",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "01",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 2,
-            "character": 7
-          },
-          "end": {
-            "line": 2,
-            "character": 7
-          }
-        },
-        "newText": "main.tex"
-      }
-    },
-    {
-      "label": "qux",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "02",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 2,
-            "character": 7
-          },
-          "end": {
-            "line": 2,
-            "character": 7
-          }
-        },
-        "newText": "qux"
-      }
-    }
-  ]
-}
diff --git a/tests/integration/snapshots/integration__completion__latex__include_relative_sub_directory.snap b/tests/integration/snapshots/integration__completion__latex__include_relative_sub_directory.snap
deleted file mode 100644
index 0d777f1d..00000000
--- a/tests/integration/snapshots/integration__completion__latex__include_relative_sub_directory.snap
+++ /dev/null
@@ -1,29 +0,0 @@
----
-source: tests/integration/completion.rs
-expression: "complete_and_resolve(&server, uri, 3, 11)?"
-
----
-{
-  "isIncomplete": false,
-  "items": [
-    {
-      "label": "baz.tex",
-      "kind": 1,
-      "preselect": false,
-      "sortText": "00",
-      "textEdit": {
-        "range": {
-          "start": {
-            "line": 3,
-            "character": 11
-          },
-          "end": {
-            "line": 3,
-            "character": 11
-          }
-        },
-        "newText": "baz.tex"
-      }
-    }
-  ]
-}