Index: elixir/trunk/tests/test_oneway.py
===================================================================
--- elixir/trunk/tests/test_oneway.py (revision 17)
+++ elixir/trunk/tests/test_oneway.py (revision 47)
@@ -8,4 +8,8 @@
 from elixir     import *
 
+#FIXME: this shouldn't be necessary. cleanup_all should handle it. The problem
+# is that with this damn dynamic behavior, we can't easily re-setup the 
+# entities once they've been setup once
+metadata.clear()
 
 class Person(Entity):
@@ -13,7 +17,4 @@
         name = Field(Unicode(30))
     )
-    
-    using_options(shortnames=True, order_by="name")
-
 
 class Animal(Entity):
@@ -24,6 +25,4 @@
     
     belongs_to('owner', of_kind='Person')
-    
-    using_options(shortnames=True, order_by="name")
 
 
@@ -35,5 +34,5 @@
     
     def teardown(self):
-        drop_all()
+        cleanup_all()
     
     def test_oneway(self):