feast-dev
diff --git a/‎core/src/main/java/feast/core/service/StatsService.java‎
Lines changed: 1 addition & 1 deletion b/‎core/src/main/java/feast/core/service/StatsService.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎core/src/test/java/feast/core/service/StatsServiceTest.java‎
Lines changed: 7 additions & 1 deletion b/‎core/src/test/java/feast/core/service/StatsServiceTest.java‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/statistics/BigQueryStatisticsRetriever.java‎
Lines changed: 6 additions & 1 deletion b/‎storage/connectors/bigquery/src/main/java/feast/storage/connectors/bigquery/statistics/BigQueryStatisticsRetriever.java‎
Lines changed: 6 additions & 1 deletion
@@ -315,7 +315,7 @@ private List<FeatureNameStatistics> getFeatureNameStatisticsByDate(
    * @param storeName name of the store to retrieve statistics from
    * @return {@link StatisticsRetriever}
    */
-  private StatisticsRetriever getStatisticsRetriever(String storeName)
+  StatisticsRetriever getStatisticsRetriever(String storeName)
       throws InvalidProtocolBufferException {
     Store store =
         storeRepository
 
@@ -18,7 +18,7 @@
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.protobuf.Timestamp;
@@ -31,6 +31,7 @@
 import feast.proto.core.StoreProto;
 import feast.proto.core.StoreProto.Store.BigQueryConfig;
 import feast.proto.core.StoreProto.Store.StoreType;
+import feast.storage.connectors.bigquery.statistics.BigQueryStatisticsRetriever;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Optional;
@@ -127,6 +128,11 @@ public void shouldThrowExceptionIfFeatureSetNotFound() throws IOException {
     when(featureSetRepository.findFeatureSetByNameAndProject_Name(
             "my_feature_set", Project.DEFAULT_NAME))
         .thenReturn(null);
+
+    statsService = spy(statsService);
+    BigQueryStatisticsRetriever retriever = mock(BigQueryStatisticsRetriever.class);
+    doReturn(retriever).when(statsService).getStatisticsRetriever(storeProto.getName());
+
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Illegal request. Unable to find feature set my_feature_set");
     statsService.getFeatureStatistics(request);
 
@@ -41,7 +41,12 @@ public abstract class BigQueryStatisticsRetriever implements StatisticsRetriever
   public abstract BigQuery bigquery();
 
   public static BigQueryStatisticsRetriever create(BigQueryConfig config) {
-    BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
+    BigQuery bigquery =
+        BigQueryOptions.getDefaultInstance()
+            .toBuilder()
+            .setProjectId(config.getProjectId())
+            .build()
+            .getService();
     return newBuilder()
         .setBigquery(bigquery)
         .setDatasetId(config.getDatasetId())