diff --git a/test/BaseTest.hx b/test/BaseTest.hx
index b5e1733..84c9570 100644
--- a/test/BaseTest.hx
+++ b/test/BaseTest.hx
@@ -16,7 +16,7 @@ class BaseTest extends BuddySuite {
 			var b:Bindable1;
 			var callNum:Int;
 
-			before(function () {
+			beforeEach(function () {
 				b = new Bindable1();
 				callNum = 0;
 			});
diff --git a/test/ChainBindTest.hx b/test/ChainBindTest.hx
index 9021a53..16e0e63 100644
--- a/test/ChainBindTest.hx
+++ b/test/ChainBindTest.hx
@@ -18,8 +18,8 @@ class ChainBindTest extends BuddySuite {
             var b:BindableChain;
             var callNum:Int;
             var target:{a:String};
-            
-            before(function () {
+
+            beforeEach(function () {
                 from = null;
                 val = "a";
                 b = new BindableChain(4);
diff --git a/test/ExprBindTest.hx b/test/ExprBindTest.hx
index 2742764..b206484 100644
--- a/test/ExprBindTest.hx
+++ b/test/ExprBindTest.hx
@@ -16,7 +16,7 @@ class ExprBindTest extends BuddySuite {
             var callNum:Int;
             var from:String;
             var target:{a:String};
-            before(function () {
+            beforeEach(function () {
                 target = {a:null};
                 from = null;
                 callNum = 0;
diff --git a/test/ForceTest.hx b/test/ForceTest.hx
index 7db1af2..237967a 100644
--- a/test/ForceTest.hx
+++ b/test/ForceTest.hx
@@ -15,7 +15,7 @@ class ForceTest extends BuddySuite {
             var b:BindableForce;
             var callNum:Int;
             
-            before(function () {
+            beforeEach(function () {
                 b = new BindableForce();
                 callNum = 0;
             });
diff --git a/test/InheritanceTest.hx b/test/InheritanceTest.hx
index 2cddcb1..e4589d6 100644
--- a/test/InheritanceTest.hx
+++ b/test/InheritanceTest.hx
@@ -15,7 +15,7 @@ class InheritanceTest extends BuddySuite {
             var bp:BindableParent;
             var callNum:Int;
             
-            before(function () {
+            beforeEach(function () {
                 b = new BindableChild();
                 bp = new BindableParent();
                 callNum = 0;
diff --git a/test/InlineTest.hx b/test/InlineTest.hx
index f0824d8..bae6c55 100644
--- a/test/InlineTest.hx
+++ b/test/InlineTest.hx
@@ -1,6 +1,5 @@
 package ;
 
-import bindx.Bind;
 import bindx.IBindable;
 import buddy.BuddySuite;
 import haxe.rtti.CType;
@@ -18,7 +17,7 @@ class InlineTest extends BuddySuite {
             var cd:Classdef;
             var foundFields:Int;
                 
-            before(function () {
+            beforeEach(function () {
                 foundFields = 0;
                 b = new BindableInline();
                 #if (haxe_ver<3.2)
diff --git a/test/MetaTest.hx b/test/MetaTest.hx
index 4b539a8..d4eceb0 100644
--- a/test/MetaTest.hx
+++ b/test/MetaTest.hx
@@ -14,8 +14,8 @@ class MetaTest extends BuddySuite {
             
             var b:BindableMeta;
             var callNum:Int;
-            
-            before(function () {
+
+            beforeEach(function () {
                 b = new BindableMeta();
                 callNum = 0;
             });
diff --git a/test/SignalTest.hx b/test/SignalTest.hx
index 8326ff0..f93923f 100644
--- a/test/SignalTest.hx
+++ b/test/SignalTest.hx
@@ -1,5 +1,6 @@
 package ;
 
+import bindx.BindSignal.MethodSignal;
 import bindx.BindSignal;
 import buddy.*;
 
@@ -14,8 +15,8 @@ class SignalTest extends BuddySuite {
             
             var fs:FieldSignal<String>;
             var callNum:Int;
-            
-            before(function () {
+
+            beforeEach(function () {
                 fs = new FieldSignal<String>();
                 callNum = 0;
             });
@@ -101,8 +102,8 @@ class SignalTest extends BuddySuite {
             
             var ms:MethodSignal;
             var callNum:Int;
-            
-            before(function () {
+
+            beforeEach(function () {
                 ms = new MethodSignal();
                 callNum = 0;
             });
diff --git a/test/TestProperty.hx b/test/TestProperty.hx
index 70897e3..4c0a989 100644
--- a/test/TestProperty.hx
+++ b/test/TestProperty.hx
@@ -14,8 +14,8 @@ class TestProperty extends BuddySuite {
 			
 			var b:BindableProperty;
             var callNum:Int;
-			
-			before(function () {
+
+			beforeEach(function () {
 				b = new BindableProperty();
                 callNum = 0;
 			});
diff --git a/test/Tests.hx b/test/Tests.hx
index 27c1dce..e802c1c 100644
--- a/test/Tests.hx
+++ b/test/Tests.hx
@@ -1,16 +1,3 @@
-package ;
+import buddy.Buddy;
 
-import buddy.BuddySuite;
-import buddy.SuitesRunner;
-
-@:build(buddy.GenerateMain.withSuites([
-    new BaseTest(),
-    new InheritanceTest(),
-    new InlineTest(),
-    new MetaTest(),
-    new SignalTest(),
-    new TestProperty(),
-    new ChainBindTest(),
-    new ExprBindTest(),
-]))
-class Tests extends BuddySuite {}
\ No newline at end of file
+class Tests implements Buddy<[BaseTest, InheritanceTest, InlineTest, ForceTest, MetaTest, SignalTest, TestProperty, ChainBindTest, ExprBindTest]> {}
\ No newline at end of file