diff --git a/datajoint/settings.py b/datajoint/settings.py
index 767171b17..7e5bfe04a 100644
--- a/datajoint/settings.py
+++ b/datajoint/settings.py
@@ -36,7 +36,7 @@
     #
     'loglevel': 'DEBUG',
     #
-    'safemode': False,
+    'safemode': True,
     #
     'display.limit': 7,
     'display.width': 14
@@ -78,6 +78,7 @@ def __getitem__(self, key):
         return self._conf[key]
 
     def __setitem__(self, key, value):
+        logger.log(logging.INFO, u"Setting {0:s} to {1:s}".format(str(key), str(value)))
         if isinstance(value, collections.Mapping):
             raise ValueError("Nested settings are not supported!")
         if validators[key](value):
diff --git a/tests/__init__.py b/tests/__init__.py
index 3290b5e27..09e358e98 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -8,6 +8,7 @@
 import pymysql
 import logging
 from os import environ
+import datajoint as dj
 
 logging.basicConfig(level=logging.DEBUG)
 
@@ -26,7 +27,7 @@
 
 def setup():
     cleanup()
-
+    dj.config['safemode'] = False
 
 def teardown():
     cleanup()
diff --git a/tests/schemata/schema1/test1.py b/tests/schemata/schema1/test1.py
index 49d07e6e2..c29eb7240 100644
--- a/tests/schemata/schema1/test1.py
+++ b/tests/schemata/schema1/test1.py
@@ -38,7 +38,7 @@ class Trials(dj.Relation):
     outcome                    : int           # result of experiment
 
     notes=""                   : varchar(4096) # other comments
-    trial_ts=CURRENT_TIMESTAMP : timestamp    # automatic
+    trial_ts=CURRENT_TIMESTAMP : timestamp     # automatic
     """
 
 
@@ -47,7 +47,7 @@ class Experiments(dj.Relation):
     definition = """
     test1.Experiments (imported)   # Experiment info
     -> test1.Subjects
-    exp_id     : int            # unique id for experiment
+    exp_id     : int               # unique id for experiment
     ---
     exp_data_file   : varchar(255) # data file
     """
@@ -59,7 +59,7 @@ class Sessions(dj.Relation):
     test1.Sessions (manual)     # Experiment sessions
     -> test1.Subjects
     -> test2.Experimenter
-    session_id     : int       # unique session id
+    session_id     : int        # unique session id
     ---
     session_comment        : varchar(255)    # comment about the session
     """