diff --git a/ip_api_test.go b/ip_api_test.go
new file mode 100644
index 0000000..d13112a
--- /dev/null
+++ b/ip_api_test.go
@@ -0,0 +1,47 @@
+package main
+
+import (
+	"testing"
+)
+
+// TestBuildURL
+// Tests that the buildURL function returns a correct URL
+func TestBuildURL(t *testing.T) {
+	var tests = []struct {
+		ip      string
+		want    string
+		explain string
+	}{
+		{"127.0.0.1", "http://ip-api.com/json/127.0.0.1", "Valid Return"},
+	}
+
+	for _, test := range tests {
+		got := buildURL(test.ip)
+		if got != test.want {
+			t.Errorf("CheckValidIP(%q) = %v, want %v", test.ip, got, test.want)
+		}
+	}
+}
+
+// TestLookup
+// Tests that the lookup function returns IPAPI data and no error
+func TestLookup(t *testing.T) {
+	var tests = []struct {
+		ip      string
+		want    string
+		explain string
+	}{
+		{"8.8.8.8", "United States", "Valid Return"},
+	}
+
+	for _, test := range tests {
+		got, err := lookup(test.ip, []string{"country"})
+		if err != nil {
+			t.Errorf("CheckValidIP(%q) = %v, want %v", test.ip, err, test.want)
+		}
+		if test.want != got.Country {
+			t.Errorf("CheckValidIP(%q) = %v, want %v", test.ip, got, test.want)
+		}
+
+	}
+}
diff --git a/utils_test.go b/utils_test.go
new file mode 100644
index 0000000..3735772
--- /dev/null
+++ b/utils_test.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestCheckValidIP(t *testing.T) {
+
+	var tests = []struct {
+		ip      string
+		want    bool
+		explain string
+	}{
+		{"127.0.0.1", true, "Valid IP"},
+		{"127.O.O.1", false, "Invalid IP"},
+	}
+
+	for _, test := range tests {
+		got := checkValidIP(test.ip)
+		if got != test.want {
+			t.Errorf("CheckValidIP(%q) = %v, want %v", test.ip, got, test.want)
+		}
+	}
+}