diff --git a/CommBank-Server/CommBank.csproj b/CommBank-Server/CommBank.csproj
index 983cc88..7bc93ff 100644
--- a/CommBank-Server/CommBank.csproj
+++ b/CommBank-Server/CommBank.csproj
@@ -9,11 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="DotNetEnv" Version="3.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-    <PackageReference Include="MongoDB.Driver" Version="2.18.0" />
+    <PackageReference Include="MongoDB.Driver" Version="3.7.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/CommBank-Server/Models/Goal.cs b/CommBank-Server/Models/Goal.cs
index 77ff1ad..29f0566 100644
--- a/CommBank-Server/Models/Goal.cs
+++ b/CommBank-Server/Models/Goal.cs
@@ -27,4 +27,7 @@ public class Goal
 
     [BsonRepresentation(BsonType.ObjectId)]
     public string? UserId { get; set; }
+    // New optional icon
+    public string? Icon { get; set; }
+
 }
\ No newline at end of file
diff --git a/CommBank-Server/Program.cs b/CommBank-Server/Program.cs
index a88e560..bdcde71 100644
--- a/CommBank-Server/Program.cs
+++ b/CommBank-Server/Program.cs
@@ -12,7 +12,7 @@
 builder.Configuration.SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile("Secrets.json");
 
 var mongoClient = new MongoClient(builder.Configuration.GetConnectionString("CommBank"));
-var mongoDatabase = mongoClient.GetDatabase("CommBank");
+var mongoDatabase = mongoClient.GetDatabase("rserver_db");
 
 IAccountsService accountsService = new AccountsService(mongoDatabase);
 IAuthService authService = new AuthService(mongoDatabase);
diff --git a/CommBank-Server/Secrets.json b/CommBank-Server/Secrets.json
index 0e5bf94..7f2f0e1 100644
--- a/CommBank-Server/Secrets.json
+++ b/CommBank-Server/Secrets.json
@@ -1,5 +1,5 @@
 {
-  "ConnectionStrings": {
-    "CommBank": "{CONNECTION_STRING}"
+ "ConnectionStrings": {
+    "CommBank": "mongodb+srv://rserver_user:PASSWORD@cluster0.flnxkb0.mongodb.net/rserver_db?retryWrites=true&w=majority"
   }
-}
\ No newline at end of file
+}
diff --git a/CommBank.Tests/GoalControllerTests.cs b/CommBank.Tests/GoalControllerTests.cs
index 8380181..1f9d0b1 100644
--- a/CommBank.Tests/GoalControllerTests.cs
+++ b/CommBank.Tests/GoalControllerTests.cs
@@ -63,12 +63,44 @@ public async void Get()
     }
 
     [Fact]
-    public async void GetForUser()
+    public async Task GetForUser_ReturnsGoalsForCorrectUser()
     {
         // Arrange
-        
+        var userId = "1";
+
+        var goals = new List<Goal>
+        {
+            new Goal
+            {
+                Id = "1",
+                UserId = userId,
+                Name = "Car",
+                TargetAmount = 5000,
+                Icon = "🚗"
+            },
+            new Goal
+            {
+                Id = "2",
+                UserId = userId,
+                Name = "House",
+                TargetAmount = 10000,
+                Icon = "🏠"
+            }
+        };
+
+        var users = collections.GetUsers();
+        IGoalsService goalsService = new FakeGoalsService(goals, goals[0]);
+        IUsersService usersService = new FakeUsersService(users, users[0]);
+        GoalController controller = new(goalsService, usersService);
+
         // Act
-        
+        var result = await controller.GetForUser(userId);
+
         // Assert
+        Assert.NotNull(result);
+        Assert.IsAssignableFrom<IEnumerable<Goal>>(result);
+        Assert.Equal(2, result!.Count());
+        Assert.All(result!, g => Assert.Equal(userId, g.UserId));
+        Assert.All(result!, g => Assert.NotNull(g.Icon));
     }
 }
\ No newline at end of file