diff --git a/network/aliases_test.go b/network/aliases_test.go
new file mode 100644
index 00000000..13da477e
--- /dev/null
+++ b/network/aliases_test.go
@@ -0,0 +1,70 @@
+package network
+
+import "testing"
+
+func buildExampleAliases() *Aliases {
+	return &Aliases{}
+}
+
+func TestAliasesLoadAliases(t *testing.T) {
+	err, _ := LoadAliases()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestAliasesSaveUnlocked(t *testing.T) {
+	exampleAliases := buildExampleAliases()
+	err := exampleAliases.saveUnlocked()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestAliasesSave(t *testing.T) {
+	exampleAliases := buildExampleAliases()
+	err := exampleAliases.Save()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func TestAliasesGet(t *testing.T) {
+	exampleAliases := buildExampleAliases()
+
+	exp := ""
+	got := exampleAliases.Get("pi:ca:tw:as:he:re")
+
+	if got != exp {
+		t.Fatalf("expected '%v', got '%v'", exp, got)
+	}
+}
+
+func TestAliasesSet(t *testing.T) {
+	exampleAliases := buildExampleAliases()
+	exampleAliases.data = make(map[string]string)
+
+	if exampleAliases.Set("pi:ca:tw:as:he:re", "picat") != nil {
+		t.Error("unable to set alias")
+	}
+
+	if exampleAliases.Get("pi:ca:tw:as:he:re") != "picat" {
+		t.Error("unable to get set alias")
+	}
+}
+
+func TestAliasesFind(t *testing.T) {
+	exampleAliases := buildExampleAliases()
+	exampleAliases.data = make(map[string]string)
+	err := exampleAliases.Set("pi:ca:tw:as:he:re", "picat")
+	if err != nil {
+		t.Error(err)
+	}
+	mac, found := exampleAliases.Find("picat")
+	if !found {
+		t.Error("unable to find mac address for alias")
+	}
+	if mac != "pi:ca:tw:as:he:re" {
+		t.Error("unable to find correct mac address for alias")
+	}
+}
diff --git a/network/lan_test.go b/network/lan_test.go
index 7cdc7ef8..ce30d1ba 100644
--- a/network/lan_test.go
+++ b/network/lan_test.go
@@ -112,9 +112,9 @@ func TestAliases(t *testing.T) {
 	exampleAlias := "picat"
 	exampleLAN := buildExampleLAN()
 	exampleEndpoint := buildExampleEndpoint()
-	exampleLAN.hosts[exampleEndpoint.HwAddress] = exampleEndpoint
+	exampleLAN.hosts["pi:ca:tw:as:he:re"] = exampleEndpoint
 	exp := exampleAlias
-	got := exampleLAN.Aliases().Get(exampleEndpoint.HwAddress)
+	got := exampleLAN.Aliases().Get("pi:ca:tw:as:he:re")
 	if got != exp {
 		t.Fatalf("expected '%v', got '%v'", exp, got)
 	}