diff --git a/Sources/Stim.Model/Game.cs b/Sources/Stim.Model/Game.cs
index 5b61bc6..9f93015 100644
--- a/Sources/Stim.Model/Game.cs
+++ b/Sources/Stim.Model/Game.cs
@@ -35,7 +35,7 @@ namespace Model
             get { return year; }
             private set
             {
-                if (value <= 1957 || value >= 2023) return;
+                if (value < 1957 || value > 2023) return;
                 year = value;
             }
         }
@@ -46,7 +46,7 @@ namespace Model
             get { return tags; }
             set
             {
-                if (tags == null || tags.Length != 3) return;
+                if (value == null || value.Length != 3) return;
                 tags = value;
             }
         }
diff --git a/Sources/Stim.Model/User.cs b/Sources/Stim.Model/User.cs
index 89a76fa..facbb9a 100644
--- a/Sources/Stim.Model/User.cs
+++ b/Sources/Stim.Model/User.cs
@@ -44,8 +44,8 @@ namespace Model
             get { return password; }
             private set
             {
-                //Regex rg = new Regex("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,32}$");
-                if (/*!rg.IsMatch(password)*/value == null) return;
+                Regex rg = new Regex("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,32}$");
+                if (!rg.IsMatch(password)/*value == null*/) return;
                 password = value;
             }
         }
diff --git a/Sources/TestProject1/TestGame.cs b/Sources/TestProject1/TestGame.cs
index c67980a..c4eaeac 100644
--- a/Sources/TestProject1/TestGame.cs
+++ b/Sources/TestProject1/TestGame.cs
@@ -39,7 +39,7 @@ namespace Test
             Game game3 = new("name", "good", 2012, tags);
             Assert.Equal("good", game3.Description);
         }
-        /*
+        
         [Fact]
         public void Year()
         {
@@ -48,10 +48,10 @@ namespace Test
             Assert.Equal(0, game.Year);
 
             Game game2 = new("name", "description", 9999, tags);
-            Assert.Equal(0, game.Year);
+            Assert.Equal(0, game2.Year);
 
             Game game3 = new("name", "description", 2012, tags);
-            Assert.Equal(2021, game.Year);
+            Assert.Equal(2012, game3.Year);
         }
 
         [Fact]
@@ -59,15 +59,15 @@ namespace Test
         {
             string[] tags = { "1", "2" }, tags2 = { "1", "2", "3" };
             Game game = new("name", "description", 2012, tags);
-            Assert.Null(game.Tags);
+            Assert.All(game.Tags, Assert.Null);
 
             Game game2 = new("name", "description", 2012, null);
-            Assert.Null(game2.Tags);
+            Assert.All(game.Tags, Assert.Null);
 
             Game game3 = new("name", "description", 2012, tags2);
             Assert.NotNull(game3.Tags); 
         }
-        */
+        
         [Fact]
         public void AddReview()
         {