diff --git a/hyperglass/models/tests/test_multi_model.py b/hyperglass/models/tests/test_multi_model.py
index 91fa848..43d8083 100644
--- a/hyperglass/models/tests/test_multi_model.py
+++ b/hyperglass/models/tests/test_multi_model.py
@@ -14,6 +14,10 @@ class Item(BaseModel):
     name: str
 
 
+class Items(MultiModel, model=Item, unique_by="id"):
+    """Multi Model Test."""
+
+
 ITEMS_1 = [
     {"id": "item1", "name": "Item One"},
     Item(id="item2", name="Item Two"),
@@ -32,7 +36,7 @@ ITEMS_3 = [
 
 
 def test_multi_model():
-    model = MultiModel(*ITEMS_1, model=Item, accessor="id")
+    model = Items(*ITEMS_1)
     assert model.count == 3
     assert len([o for o in model]) == model.count  # noqa: C416 (Iteration testing)
     assert model["item1"].name == "Item One"
diff --git a/hyperglass/plugins/tests/test_bgp_route_juniper.py b/hyperglass/plugins/tests/test_bgp_route_juniper.py
index 816c452..ef9aed9 100644
--- a/hyperglass/plugins/tests/test_bgp_route_juniper.py
+++ b/hyperglass/plugins/tests/test_bgp_route_juniper.py
@@ -9,6 +9,7 @@ import pytest
 
 # Project
 from hyperglass.log import log
+from hyperglass.models.api.query import Query
 from hyperglass.models.config.devices import Device
 from hyperglass.models.data.bgp_route import BGPRouteTable
 
@@ -42,7 +43,9 @@ def _tester(sample: str):
     # Override has_directives method for testing.
     device.has_directives = lambda *x: True
 
-    result = plugin.process((sample,), device)
+    query = type("Query", (), {"device": device})
+
+    result = plugin.process(output=(sample,), query=query)
     assert isinstance(result, BGPRouteTable), "Invalid parsed result"
     assert hasattr(result, "count"), "BGP Table missing count"
     assert result.count > 0, "BGP Table count is 0"