2 files changed, 11 insertions, 10 deletions
diff --git a/engine-ecs/src/component/storage/archetype.rs b/engine-ecs/src/component/storage/archetype.rs
index 236bf97..e72126a 100644
--- a/engine-ecs/src/component/storage/archetype.rs
+++ b/engine-ecs/src/component/storage/archetype.rs
@@ -112,6 +112,13 @@ impl Archetype
         self.component_index_lookup.len()
     }
 
+    // Currently only used by a test
+    #[allow(dead_code)]
+    pub fn entity_cnt(&self) -> usize
+    {
+        self.entities.len()
+    }
+
     pub fn get_matching_component_indices(
         &self,
         component_id: Uid,
diff --git a/engine-ecs/tests/query.rs b/engine-ecs/tests/query.rs
index 870ff42..d6dd8b7 100644
--- a/engine-ecs/tests/query.rs
+++ b/engine-ecs/tests/query.rs
@@ -1,12 +1,9 @@
 use engine_ecs::component::Component;
 use engine_ecs::pair::{Pair, Wildcard};
 use engine_ecs::query::term::Without;
-use engine_ecs::query::{
-    TermTuple as QueryTermTuple,
-    Query,
-};
+use engine_ecs::query::{Query, TermTuple as QueryTermTuple};
 use engine_ecs::uid::Uid;
-use engine_ecs::{World, Component};
+use engine_ecs::{Component, World};
 use parking_lot::{Mutex, Once};
 
 pub static SETUP: Once = Once::new();
@@ -51,7 +48,7 @@ fn assert_query_finds_ents<'world, QueryTerms>(
     query: Query<'world, QueryTerms>,
     mut expected_ent_ids: Vec<Uid>,
 ) where
-    QueryTerms: QueryTermTuple<'world>,
+    for<'query> QueryTerms: QueryTermTuple<'query>,
 {
     assert!(
         query.iter_with_euids().all(|(ent_id, _)| {
@@ -405,8 +402,5 @@ fn query_with_component_target_pair()
         Pair::builder().relation::<G>().target_as_data(F).build(),
     ));
 
-    assert_query_finds_ents(
-        world.query::<(&B, Pair<G, &F>)>(),
-        vec![ent_2_id, ent_3_id],
-    );
+    assert_query_finds_ents(world.query::<(&B, Pair<G, &F>)>(), vec![ent_2_id, ent_3_id]);
 }