diff --git a/etsy/__init__.py b/etsy/__init__.py
index 32e5cf1..7d4db3e 100644
--- a/etsy/__init__.py
+++ b/etsy/__init__.py
@@ -1,5 +1,5 @@
 from _v2 import EtsyV2 as Etsy
-from etsy_env import EtsyEnvSandbox, EtsyEnvProduction
+from env import EtsyEnvSandbox, EtsyEnvProduction
 
 
 __version__ = '0.3.1'
@@ -7,4 +7,3 @@
 __copyright__ = 'Copyright 2010, Etsy Inc.'
 __license__ = 'GPL v3'
 __email__ = 'dan@etsy.com'
-
diff --git a/etsy/_core.py b/etsy/_core.py
index b28b588..4b90442 100644
--- a/etsy/_core.py
+++ b/etsy/_core.py
@@ -7,7 +7,7 @@
 import re
 import tempfile
 import time
-from _multipartformdataencode import encode_multipart_formdata
+from _util import encode_multipart_formdata
 
 
 missing = object()
diff --git a/etsy/_multipartformdataencode.py b/etsy/_util.py
similarity index 100%
rename from etsy/_multipartformdataencode.py
rename to etsy/_util.py
diff --git a/etsy/_v2.py b/etsy/_v2.py
index 6e1d1e8..8ac6d5f 100644
--- a/etsy/_v2.py
+++ b/etsy/_v2.py
@@ -1,6 +1,6 @@
 import urllib
 from _core import API, missing
-from etsy_env import EtsyEnvSandbox, EtsyEnvProduction
+from env import EtsyEnvSandbox, EtsyEnvProduction
 
 try:
     from urlparse import parse_qsl
@@ -11,7 +11,7 @@ class EtsyV2(API):
     api_version = 'v2'
 
     def __init__(self, api_key='', key_file=None, method_cache=missing, 
-                 etsy_env=EtsyEnvSandbox(), log=None, etsy_oauth_client=None):
+                 etsy_env=EtsyEnvSandbox, log=None, etsy_oauth_client=None):
         self.api_url = etsy_env.api_url
         self.etsy_oauth_client = None
 
diff --git a/etsy/etsy_env.py b/etsy/env.py
similarity index 100%
rename from etsy/etsy_env.py
rename to etsy/env.py
diff --git a/etsy/oauth.py b/etsy/oauth.py
index 21252b6..32c6106 100644
--- a/etsy/oauth.py
+++ b/etsy/oauth.py
@@ -1,12 +1,12 @@
 import oauth2 as oauth
 import urllib
 from cgi import parse_qsl
-from etsy_env import EtsyEnvSandbox, EtsyEnvProduction
+from env import EtsyEnvSandbox, EtsyEnvProduction
 
 EtsyOAuthToken = oauth.Token
 
 class EtsyOAuthClient(oauth.Client):
-    def __init__(self, oauth_consumer_key, oauth_consumer_secret, etsy_env=EtsyEnvSandbox(), token=None, logger=None):
+    def __init__(self, oauth_consumer_key, oauth_consumer_secret, etsy_env=EtsyEnvSandbox, token=None, logger=None):
         consumer = oauth.Consumer(oauth_consumer_key, oauth_consumer_secret)
         super(EtsyOAuthClient, self).__init__(consumer)
         self.request_token_url = etsy_env.request_token_url
diff --git a/setup.py b/setup.py
index 7fdccbb..e750043 100755
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@
     keywords = 'etsy api handmade',
     packages = ['etsy'],
     long_description = long_description,
-    test_suite = 'test',
+    test_suite = 'test.test_core',
     install_requires=['simplejson >= 2.0'],
     extras_require = {
         'OAuth': ["oauth2>=1.2.0"],
diff --git a/etsy/test_v2.py b/test/test_v2.py
similarity index 98%
rename from etsy/test_v2.py
rename to test/test_v2.py
index e112f87..199abe1 100755
--- a/etsy/test_v2.py
+++ b/test/test_v2.py
@@ -7,7 +7,7 @@
 from etsy.oauth import EtsyOAuthClient
 
 logging_enabled = True
-etsy_env = EtsyEnvProduction()
+etsy_env = EtsyEnvProduction
 
 def my_log(msg):
     if logging_enabled: print(msg)