diff --git a/backend/character/handlers_test.go b/backend/character/handlers_test.go
index 7109ff4..e17ad03 100644
--- a/backend/character/handlers_test.go
+++ b/backend/character/handlers_test.go
@@ -491,7 +491,7 @@ func TestGetAvailableSpellsForCreation(t *testing.T) {
 			name:           "NonMagicCharacterClass",
 			characterClass: "Kr",
 			expectStatus:   http.StatusNotFound,
-			expectError:    true,
+			expectError:    false,
 			findspells:     false,
 		},
 		{
@@ -743,23 +743,23 @@ func TestFinalizeCharacterCreation(t *testing.T) {
 		}
 
 		// Validate each attribute matches the session data
-		assert.Equal(t, 87, attrMap["IN"], "Intelligence should match session")
-		assert.Equal(t, 74, attrMap["ST"], "Strength should match session")
-		assert.Equal(t, 65, attrMap["GS"], "Dexterity should match session")
-		assert.Equal(t, 76, attrMap["GW"], "Agility should match session")
-		assert.Equal(t, 58, attrMap["KO"], "Constitution should match session")
-		assert.Equal(t, 83, attrMap["ZT"], "Magic Talent should match session")
-		assert.Equal(t, 69, attrMap["AU"], "Charisma should match session")
-		assert.Equal(t, 59, attrMap["pA"], "Personal Charisma should match session")
-		assert.Equal(t, 72, attrMap["WK"], "Willpower should match session")
+		assert.Equal(t, 87, attrMap["In"], "Intelligence should match session")
+		assert.Equal(t, 89, attrMap["St"], "Strength should match session")
+		assert.Equal(t, 64, attrMap["Gs"], "Dexterity should match session")
+		assert.Equal(t, 77, attrMap["Gw"], "Agility should match session")
+		assert.Equal(t, 71, attrMap["Ko"], "Constitution should match session")
+		assert.Equal(t, 44, attrMap["Zt"], "Magic Talent should match session")
+		assert.Equal(t, 87, attrMap["Au"], "Charisma should match session")
+		assert.Equal(t, 33, attrMap["pA"], "Personal Charisma should match session")
+		assert.Equal(t, 27, attrMap["Wk"], "Willpower should match session")
 
 		// Validate derived values
-		assert.Equal(t, 17, createdChar.Lp.Max, "LP Max should match session")
-		assert.Equal(t, 17, createdChar.Lp.Value, "LP Value should equal Max initially")
-		assert.Equal(t, 33, createdChar.Ap.Max, "AP Max should match session")
-		assert.Equal(t, 33, createdChar.Ap.Value, "AP Value should equal Max initially")
-		assert.Equal(t, 8, createdChar.B.Max, "B Max should match session")
-		assert.Equal(t, 8, createdChar.B.Value, "B Value should equal Max initially")
+		assert.Equal(t, 11, createdChar.Lp.Max, "LP Max should match session")
+		assert.Equal(t, 11, createdChar.Lp.Value, "LP Value should equal Max initially")
+		assert.Equal(t, 14, createdChar.Ap.Max, "AP Max should match session")
+		assert.Equal(t, 14, createdChar.Ap.Value, "AP Value should equal Max initially")
+		assert.Equal(t, 26, createdChar.B.Max, "B Max should match session")
+		assert.Equal(t, 26, createdChar.B.Value, "B Value should equal Max initially")
 
 		// Validate static derived values (Resistenz, Abwehr, Zaubern, Raufen)
 		assert.Equal(t, 11, createdChar.ResistenzKoerper, "Resistenz Körper should match session")
@@ -1065,10 +1065,10 @@ func TestGetDatasheetOptions(t *testing.T) {
 
 	origins := response["origins"].([]interface{})
 	assert.Equal(t, 15, len(origins))
-	assert.Contains(t, origins, "Albai")
+	assert.Contains(t, origins, "Alba")
 
 	socialClasses := response["social_classes"].([]interface{})
-	assert.Equal(t, 3, len(socialClasses))
+	assert.Equal(t, 4, len(socialClasses))
 	assert.Contains(t, socialClasses, "Adel")
 	assert.Contains(t, socialClasses, "Mittelschicht")
 
diff --git a/backend/character/learn_spell_test.go b/backend/character/learn_spell_test.go
index fb3e41d..282aa49 100644
--- a/backend/character/learn_spell_test.go
+++ b/backend/character/learn_spell_test.go
@@ -23,7 +23,7 @@ func TestLearnSpell(t *testing.T) {
 	// Setup Gin in test mode
 	gin.SetMode(gin.TestMode)
 
-	t.Run("Learn spell 'Befestigen (S)' for character ID 18", func(t *testing.T) {
+	t.Run("Learn spell 'Befestigen' for character ID 18", func(t *testing.T) {
 		// Ensure character has sufficient resources
 		var character models.Char
 		if err := database.DB.Preload("Erfahrungsschatz").Preload("Vermoegen").First(&character, 18).Error; err != nil {
@@ -49,7 +49,7 @@ func TestLearnSpell(t *testing.T) {
 		// Create LernCostRequest (new format)
 		request := map[string]interface{}{
 			"char_id":       18,
-			"name":          "Befestigen (S)",
+			"name":          "Befestigen",
 			"type":          "spell",
 			"action":        "learn",
 			"current_level": 0,
@@ -75,7 +75,7 @@ func TestLearnSpell(t *testing.T) {
 		c.Request = req
 		c.Params = []gin.Param{{Key: "id", Value: "18"}}
 
-		fmt.Printf("Test: Learn spell 'Befestigen (S)' for character ID 18\n")
+		fmt.Printf("Test: Learn spell 'Befestigen' for character ID 18\n")
 		fmt.Printf("Request: %s\n", string(requestJSON))
 		fmt.Printf("Initial EP: %d, Initial Gold: %d\n", initialEP, initialGold)
 
@@ -97,7 +97,7 @@ func TestLearnSpell(t *testing.T) {
 		// Check response structure
 		assert.Contains(t, response, "message", "Response should contain success message")
 		assert.Contains(t, response, "spell_name", "Response should contain spell name")
-		assert.Equal(t, "Befestigen (S)", response["spell_name"], "Spell name should match")
+		assert.Equal(t, "Befestigen", response["spell_name"], "Spell name should match")
 
 		// Verify spell was added to character
 		var updatedCharacter models.Char
@@ -107,12 +107,12 @@ func TestLearnSpell(t *testing.T) {
 		// Check if spell was added
 		spellFound := false
 		for _, spell := range updatedCharacter.Zauber {
-			if spell.Name == "Befestigen (S)" {
+			if spell.Name == "Befestigen" {
 				spellFound = true
 				break
 			}
 		}
-		assert.True(t, spellFound, "Spell 'Befestigen (S)' should be added to character")
+		assert.True(t, spellFound, "Spell 'Befestigen' should be added to character")
 
 		// Verify resources were deducted
 		assert.Less(t, updatedCharacter.Erfahrungsschatz.EP, initialEP, "EP should be deducted")