diff --git a/internal/entity/album_test.go b/internal/entity/album_test.go
index 641df6137..67e5a2338 100644
--- a/internal/entity/album_test.go
+++ b/internal/entity/album_test.go
@@ -1,6 +1,7 @@
 package entity
 
 import (
+	"github.com/photoprism/photoprism/internal/form"
 	"testing"
 	"time"
 
@@ -61,3 +62,30 @@ is an oblate spheroid.`
 		assert.Contains(t, album.AlbumSlug, slug.Make(slugExpected))
 	})
 }
+
+func TestAlbum_Save(t *testing.T) {
+	t.Run("success", func(t *testing.T) {
+		album := NewAlbum("Old Name")
+
+		assert.Equal(t, "Old Name", album.AlbumName)
+		assert.Equal(t, "old-name", album.AlbumSlug)
+
+		album2 := Album{ID: 123, AlbumName: "New name", AlbumDescription: "new description"}
+
+		albumForm, err := form.NewAlbum(album2)
+
+		if err != nil {
+			t.Fatal("error")
+		}
+
+		err = album.Save(albumForm)
+
+		if err != nil {
+			t.Fatal("error")
+		}
+
+		assert.Equal(t, "New name", album.AlbumName)
+		assert.Equal(t, "new description", album.AlbumDescription)
+	})
+
+}
diff --git a/internal/entity/camera_test.go b/internal/entity/camera_test.go
index a99b6a3c6..0bcf09fd9 100644
--- a/internal/entity/camera_test.go
+++ b/internal/entity/camera_test.go
@@ -68,7 +68,12 @@ func TestCamera_String(t *testing.T) {
 		cameraString := camera.String()
 		assert.Equal(t, "XXX", cameraString)
 	})
-	t.Run("model Unkown make Unknown", func(t *testing.T) {
+	t.Run("model Unknown make XXX", func(t *testing.T) {
+		camera := NewCamera("", "test")
+		cameraString := camera.String()
+		assert.Equal(t, "Unknown", cameraString)
+	})
+	t.Run("model Unknown make Unknown", func(t *testing.T) {
 		camera := NewCamera("", "")
 		cameraString := camera.String()
 		assert.Equal(t, "Unknown", cameraString)
diff --git a/internal/entity/country_test.go b/internal/entity/country_test.go
new file mode 100644
index 000000000..789d687a6
--- /dev/null
+++ b/internal/entity/country_test.go
@@ -0,0 +1,43 @@
+package entity
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestNewCountry(t *testing.T) {
+	t.Run("unknown country", func(t *testing.T) {
+		country := NewCountry("", "")
+
+		assert.Equal(t, &UnknownCountry, country)
+	})
+	t.Run("United States", func(t *testing.T) {
+		country := NewCountry("us", "United States")
+
+		assert.Equal(t, "USA", country.CountryName)
+		assert.Equal(t, "usa", country.CountrySlug)
+	})
+	t.Run("Germany", func(t *testing.T) {
+		country := NewCountry("de", "Germany")
+
+		assert.Equal(t, "Germany", country.CountryName)
+		assert.Equal(t, "germany", country.CountrySlug)
+	})
+}
+
+func TestCountry_FirstOrCreate(t *testing.T) {
+	t.Run("es", func(t *testing.T) {
+		country := NewCountry("es", "spain")
+		country.FirstOrCreate()
+	})
+}
+
+func TestCountry_Name(t *testing.T) {
+	country := NewCountry("xy", "Neverland")
+	assert.Equal(t, "Neverland", country.Name())
+}
+
+func TestCountry_Code(t *testing.T) {
+	country := NewCountry("xy", "Neverland")
+	assert.Equal(t, "xy", country.Code())
+}