diff --git a/__main__.py b/__main__.py
index 9939195e2928140fde7176c927841a62ac07ac94..f9e72a897a76a2b004c5d458ac01ec7cbc05d0d6 100755
--- a/__main__.py
+++ b/__main__.py
@@ -79,6 +79,8 @@ from .tests.basic.basic import BASIC_TESTS
 from .tests.asgn3.availability.availability_basic import AVAILABILITY_TESTS
 from .tests.asgn3.causal_consistency.causal_basic import CAUSAL_TESTS
 from .tests.asgn3.eventual_consistency.convergence_basic import CONVERGENCE_TESTS
+# from .tests.asgn3.view_change.view_change_basic import VIEW_CHANGE_TESTS
+from .tests.proxy.basic_proxy import PROXY_TESTS
 
 TEST_SET = []
 TEST_SET.append(TestCase("hello_cluster", hello_cluster))
@@ -86,6 +88,8 @@ TEST_SET.extend(BASIC_TESTS)
 TEST_SET.extend(AVAILABILITY_TESTS)
 TEST_SET.extend(CAUSAL_TESTS)
 TEST_SET.extend(CONVERGENCE_TESTS)
+TEST_SET.extend(PROXY_TESTS)
+# TEST_SET.extend(VIEW_CHANGE_TESTS)
 
 # set to True to stop at the first failing test
 FAIL_FAST = True