diff --git a/internal/entity/photo_fixtures.go b/internal/entity/photo_fixtures.go
index 130b9c6f0..5b1c1d364 100644
--- a/internal/entity/photo_fixtures.go
+++ b/internal/entity/photo_fixtures.go
@@ -27,7 +27,7 @@ func (m PhotoMap) Pointer(name string) *Photo {
 }
 
 var PhotoFixtures = PhotoMap{
-	"19800101_000002_D640C559": { //JPG, Imported, No Geoinformation
+	"19800101_000002_D640C559": { //JPG, Imported, No Geo-information
 		ID: 1000000,
 		// UUID:
 		PhotoUID:         "pt9jtdre2lvl0yh7",
@@ -95,13 +95,13 @@ var PhotoFixtures = PhotoMap{
 		PhotoStack: 0,
 		PhotoFaces: 5,
 	},
-	"Photo01": { //DNG + XMP
+	"Photo01": { //DNG + XMP,  Indexed, lat/lng manually set
 		ID:               1000001,
 		PhotoUID:         "pt9jtdre2lvl0yh8",
 		TakenAt:          time.Date(2006, 1, 1, 2, 0, 0, 0, time.UTC),
 		TakenAtLocal:     time.Date(2006, 1, 1, 2, 0, 0, 0, time.UTC),
 		TakenSrc:         "meta",
-		PhotoType:        "image",
+		PhotoType:        "raw",
 		TypeSrc:          "",
 		PhotoTitle:       "",
 		TitleSrc:         "",
@@ -115,16 +115,16 @@ var PhotoFixtures = PhotoMap{
 		PhotoScan:        false,
 		PhotoPanorama:    false,
 		TimeZone:         "",
-		Place:            &UnknownPlace,
-		PlaceID:          UnknownPlace.ID,
-		PlaceSrc:         "",
-		Cell:             &UnknownLocation,
-		CellID:           UnknownLocation.ID,
+		Place:            PlaceFixtures.Pointer("Germany"),
+		PlaceID:          PlaceFixtures.Pointer("Germany").ID,
+		PlaceSrc:         "manual",
+		Cell:             CellFixtures.Pointer("Neckarbrücke"),
+		CellID:           CellFixtures.Pointer("Neckarbrücke").ID,
 		CellAccuracy:     0,
 		PhotoAltitude:    0,
 		PhotoLat:         48.519234,
 		PhotoLng:         9.057997,
-		PhotoCountry:     UnknownPlace.CountryCode(),
+		PhotoCountry:     "de",
 		PhotoYear:        2790,
 		PhotoMonth:       2,
 		PhotoDay:         12,
@@ -148,28 +148,28 @@ var PhotoFixtures = PhotoMap{
 			LabelFixtures.PhotoLabel(1000001, "no-jpeg", 20, "image"),
 		},
 		CreatedAt:  time.Date(2009, 1, 1, 0, 0, 0, 0, time.UTC),
-		UpdatedAt:  time.Date(2008, 1, 1, 0, 0, 0, 0, time.UTC),
+		UpdatedAt:  time.Date(2020, 3, 28, 14, 6, 0, 0, time.UTC),
 		EditedAt:   nil,
 		CheckedAt:  &checkedTime,
 		DeletedAt:  nil,
-		PhotoColor: 14,
+		PhotoColor: 3,
 		PhotoStack: 0,
 		PhotoFaces: 5,
 	},
-	"Photo02": { //JPG
+	"Photo02": { //JPG, Indexed, No Geo-information
 		ID:               1000002,
 		PhotoUID:         "pt9jtdre2lvl0yh9",
-		TakenAt:          time.Date(2008, 1, 1, 0, 0, 0, 0, time.UTC),
-		TakenAtLocal:     time.Date(2008, 1, 1, 0, 0, 0, 0, time.UTC),
-		TakenSrc:         "meta",
+		TakenAt:          time.Date(1990, 3, 2, 0, 0, 0, 0, time.UTC),
+		TakenAtLocal:     time.Date(1990, 3, 2, 0, 0, 0, 0, time.UTC),
+		TakenSrc:         "manual",
 		PhotoType:        "image",
 		TypeSrc:          "",
 		PhotoTitle:       "",
 		TitleSrc:         "",
 		PhotoDescription: "",
 		DescriptionSrc:   "",
-		PhotoPath:        "1990/03",
-		PhotoName:        "Photo02",
+		PhotoPath:        "London",
+		PhotoName:        "bridge1",
 		OriginalName:     "",
 		PhotoFavorite:    false,
 		PhotoPrivate:     false,
@@ -183,8 +183,8 @@ var PhotoFixtures = PhotoMap{
 		CellID:           UnknownLocation.ID,
 		CellAccuracy:     0,
 		PhotoAltitude:    0,
-		PhotoLat:         48.519234,
-		PhotoLng:         9.057997,
+		PhotoLat:         0,
+		PhotoLng:         0,
 		PhotoCountry:     UnknownPlace.CountryCode(),
 		PhotoYear:        1990,
 		PhotoMonth:       3,
@@ -211,7 +211,7 @@ var PhotoFixtures = PhotoMap{
 		EditedAt:         nil,
 		CheckedAt:        &checkedTime,
 		DeletedAt:        nil,
-		PhotoColor:       14,
+		PhotoColor:       12,
 		PhotoStack:       0,
 		PhotoFaces:       0,
 	},