diff --git a/lib/angel_test.dart b/lib/angel_test.dart
index 8084f4d5..cf5be8b9 100644
--- a/lib/angel_test.dart
+++ b/lib/angel_test.dart
@@ -1 +1,2 @@
-export 'src/client.dart';
\ No newline at end of file
+export 'src/client.dart';
+export 'src/matchers.dart';
\ No newline at end of file
diff --git a/lib/src/matchers.dart b/lib/src/matchers.dart
index e69de29b..fbf7cb9a 100644
--- a/lib/src/matchers.dart
+++ b/lib/src/matchers.dart
@@ -0,0 +1,6 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import 'package:matcher/matcher.dart';
+
+/// Expects a given response, when parsed as JSON,
+/// to equal a desired value.
\ No newline at end of file
diff --git a/test/simple_test.dart b/test/simple_test.dart
index 8fc36d0c..46bc63bd 100644
--- a/test/simple_test.dart
+++ b/test/simple_test.dart
@@ -1,8 +1,17 @@
-import 'package:angel_framework/angel_framework.dart';
+import 'package:angel_framework/angel_framework.dart' as server;
+import 'package:angel_client/angel_client.dart' as client;
 import 'package:angel_test/angel_test.dart';
 import 'package:test/test.dart';
 
 main() {
-  Angel app;
+  server.Angel app;
+  client.Angel clientApp;
 
+  setUp(() async {
+    app.get('/hello', 'Hello');
+
+    clientApp = await connectTo(app);
+  });
+
+  tearDown(clientApp.close);
 }
\ No newline at end of file