diff --git a/python/__init__.py b/python/__init__.py
index 799e34ca5160144f4add23d624c86036aaa57dad..5da1eda497e49dd18befb045cff54169bb4a9138 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -1 +1 @@
-from csmapi import *
+from csmapi.csmapi import *
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index e3424316b511e414bca63a2dc7f876bcfb2edd37..0fb697ade757e976bf71211bdd4e39773d0da795 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -2,9 +2,10 @@ import pytest
 
 import csmapi
 import ctypes
+from ctypes.util import find_library
 
 # Load a plugin with CSM compliant sensors
-lib = ctypes.CDLL('/data/big/github/CSM-CameraModel/build/libusgscsm.so')
+lib = ctypes.CDLL(find_library('usgscsm.so'))
 
 @pytest.fixture
 def plugin():