diff --git a/internal/entityfiles/entityfiles.go b/internal/entityfiles/entityfiles.go
index ebb5e39..b28abeb 100644
--- a/internal/entityfiles/entityfiles.go
+++ b/internal/entityfiles/entityfiles.go
@@ -111,7 +111,7 @@ func updateEvmFromFile(entityname string, data []map[string]string) {
 
 	sv.RemoveKeysThatStartWith("entities." + entityname)
 
-	sv.Set("entities."+entityname+".count", fmt.Sprintf("%v", count))
+	sv.SetEntityCount(entityname, count)
 
 	for i, mapp := range data {
 		prefix := "entities." + entityname + "." + fmt.Sprintf("%v", i)
diff --git a/internal/stringvariables/entities.go b/internal/stringvariables/entities.go
index a6aaa97..026514a 100644
--- a/internal/stringvariables/entities.go
+++ b/internal/stringvariables/entities.go
@@ -61,3 +61,7 @@ func GetEntityCount(entityTitle string) int {
 
 	return count
 }
+
+func SetEntityCount(entityTitle string, count int) {
+	Set("entities."+entityTitle+".count", fmt.Sprintf("%v", count))
+}
diff --git a/internal/stringvariables/entities_test.go b/internal/stringvariables/entities_test.go
new file mode 100644
index 0000000..1a75a38
--- /dev/null
+++ b/internal/stringvariables/entities_test.go
@@ -0,0 +1,12 @@
+package stringvariables
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestEntityCount(t *testing.T) {
+	SetEntityCount("waffles", 3)
+
+	assert.Equal(t, 3, GetEntityCount("waffles"))
+}
diff --git a/internal/stringvariables/map_test.go b/internal/stringvariables/map_test.go
new file mode 100644
index 0000000..d658387
--- /dev/null
+++ b/internal/stringvariables/map_test.go
@@ -0,0 +1,20 @@
+package stringvariables
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestGetAndSet(t *testing.T) {
+	Set("foo", "bar")
+	Set("salutation", "hello")
+
+	assert.Equal(t, "bar", Get("foo"))
+	assert.Equal(t, "", Get("not exist"))
+}
+
+func TestGetall(t *testing.T) {
+	ret := GetAll()
+
+	assert.NotEmpty(t, ret)
+}