diff --git a/environment.yml b/environment.yml
index ee19b51..0266a02 100644
--- a/environment.yml
+++ b/environment.yml
@@ -19,7 +19,7 @@ dependencies:
   - matplotlib>=1.2.0
   - pip
   # optional, for documentation and testing:
-  - nb_conda
+  # - nb_conda   # excluded until https://github.com/conda-forge/nb_conda-feedstock/issues/21 is fixed
   # ----------------------------------------
   - pip:
     - pynetcf>=0.4.0
diff --git a/tests/test_validation_framework/test_adapters.py b/tests/test_validation_framework/test_adapters.py
index 3c125ad..68d8314 100644
--- a/tests/test_validation_framework/test_adapters.py
+++ b/tests/test_validation_framework/test_adapters.py
@@ -1,6 +1,6 @@
 import pytest
 
-from src.pytesmo.validation_framework.adapters import TimestampAdapter
+from pytesmo.validation_framework.adapters import TimestampAdapter
 """
 Test for the adapters.
 """
@@ -278,7 +278,7 @@ def test_column_comb_adapter():
     orig = ds.read()
     ds_adapted = ColumnCombineAdapter(
         ds,
-        func=pd.DataFrame.mean,
+        func=pd.Series.mean,
         columns=["x", "y"],
         func_kwargs={'skipna': True},
         new_name='xy_mean')