diff --git a/tests/testclient.nim b/tests/testclient.nim
index 65a9e4e..9757867 100644
--- a/tests/testclient.nim
+++ b/tests/testclient.nim
@@ -1,13 +1,18 @@
-import ../src/rpcclient, asyncdispatch, json
+import ../eth-rpc/rpcclient, asyncdispatch, json, unittest
 
 when isMainModule:
-  proc main {.async.} =
-    var client = newRpcClient()
-    await client.connect("localhost", Port(8545))
-    var
-      response: Response
+  suite "RPC":
+    proc main {.async.} =
+      var client = newRpcClient()
+      await client.connect("localhost", Port(8545))
+      var response: Response
 
-    for i in 0..1000:
-      response = waitFor client.web3_clientVersion(newJNull())
-  waitFor main()
+      test "Version":
+        response = waitFor client.web3_clientVersion(newJNull())
+        check response.result == %"Nimbus-RPC-Test"
+      test "SHA3":
+        response = waitFor client.web3_sha3(%"abc")
+        check response.result.getStr == "3A985DA74FE225B2045C172D6BD390BD855F086E3E9D525B46BFE24511431532"
+
+    waitFor main()
   echo "Finished."
\ No newline at end of file