diff --git a/packages/firestore/lib/index.d.ts b/packages/firestore/lib/index.d.ts
index 5a46fdc944..0920501df7 100644
--- a/packages/firestore/lib/index.d.ts
+++ b/packages/firestore/lib/index.d.ts
@@ -2340,6 +2340,8 @@ export const firebase: ReactNativeFirebase.Module & {
   ): ReactNativeFirebase.FirebaseApp & { firestore(): FirebaseFirestoreTypes.Module };
 };
 
+export * from './modular';
+
 export const Filter: FilterFunction;
 
 export default defaultExport;
diff --git a/packages/firestore/lib/modular/index.d.ts b/packages/firestore/lib/modular/index.d.ts
index 74b27ab853..c161da7ae0 100644
--- a/packages/firestore/lib/modular/index.d.ts
+++ b/packages/firestore/lib/modular/index.d.ts
@@ -532,3 +532,11 @@ export function namedQuery(firestore: Firestore, name: string): Query<DocumentDa
  * writes.
  */
 export function writeBatch(firestore: Firestore): FirebaseFirestoreTypes.WriteBatch;
+
+export * from './query';
+export * from './snapshot';
+export * from './Bytes';
+export * from './FieldPath';
+export * from './FieldValue';
+export * from './GeoPoint';
+export * from './Timestamp';
diff --git a/packages/firestore/type-test.ts b/packages/firestore/type-test.ts
index 1380362c65..d2ff644f93 100644
--- a/packages/firestore/type-test.ts
+++ b/packages/firestore/type-test.ts
@@ -1,4 +1,21 @@
-import firebase, { FirebaseFirestoreTypes } from '.';
+import firebase, {
+  FirebaseFirestoreTypes,
+  addDoc,
+  collection,
+  collectionGroup,
+  doc,
+  endAt,
+  getDoc,
+  getDocFromCache,
+  getDocFromServer,
+  getDocs,
+  getDocsFromCache,
+  getDocsFromServer,
+  onSnapshot,
+  query,
+  startAfter,
+  updateDoc,
+} from '.';
 
 console.log(firebase().collection);
 
@@ -107,3 +124,70 @@ firebase
       complete() {},
     },
   );
+
+collection(firebase.firestore(), 'foo');
+collection(firebase.firestore(), 'foo', 'foo', 'foo');
+collection(doc(collection(firebase.firestore(), 'foo'), 'foo'), 'foo');
+doc(firebase.firestore(), 'foo', 'foo');
+doc(collection(firebase.firestore(), 'foo'), 'foo');
+addDoc(collection(firebase.firestore(), 'foo'), { foo: 'bar' }).then();
+updateDoc(doc(firebase.firestore(), 'foo', 'foo'), { foo: 'bar' }).then();
+getDoc(doc(firebase.firestore(), 'foo', 'foo')).then();
+getDocFromCache(doc(firebase.firestore(), 'foo', 'foo')).then();
+getDocFromServer(doc(firebase.firestore(), 'foo', 'foo')).then();
+getDocs(query(collectionGroup(firebase.firestore(), 'foo'), endAt(123), startAfter(123))).then();
+getDocsFromCache(
+  query(collectionGroup(firebase.firestore(), 'foo'), endAt(123), startAfter(123)),
+).then();
+getDocsFromServer(
+  query(collectionGroup(firebase.firestore(), 'foo'), endAt(123), startAfter(123)),
+).then();
+onSnapshot(doc(firebase.firestore(), 'foo', 'foo'), () => {});
+onSnapshot(doc(firebase.firestore(), 'foo', 'foo'), {
+  next: (snapshot: FirebaseFirestoreTypes.DocumentSnapshot) => {
+    console.log(snapshot.get('foo'));
+  },
+  error: (error: { message: any }) => {
+    console.log(error.message);
+  },
+});
+onSnapshot(
+  doc(firebase.firestore(), 'foo', 'foo'),
+  {
+    includeMetadataChanges: true,
+  },
+  {
+    next: (snapshot: FirebaseFirestoreTypes.DocumentSnapshot) => {
+      console.log(snapshot.get('foo'));
+    },
+    error: (error: { message: any }) => {
+      console.log(error.message);
+    },
+    complete() {},
+  },
+);
+onSnapshot(
+  collection(firebase.firestore(), 'foo'),
+  (snapshot: FirebaseFirestoreTypes.QuerySnapshot) => {
+    console.log(snapshot.docs);
+  },
+  (error: { message: any }) => {
+    console.log(error.message);
+  },
+  () => {},
+);
+onSnapshot(
+  collection(firebase.firestore(), 'foo'),
+  {
+    includeMetadataChanges: true,
+  },
+  {
+    next: (snapshot: FirebaseFirestoreTypes.QuerySnapshot) => {
+      console.log(snapshot.docs);
+    },
+    error: (error: { message: any }) => {
+      console.log(error.message);
+    },
+    complete() {},
+  },
+);