diff --git a/test/cannery/activity_log_test.exs b/test/cannery/activity_log_test.exs
index b5439eae..21f1dac5 100644
--- a/test/cannery/activity_log_test.exs
+++ b/test/cannery/activity_log_test.exs
@@ -1,67 +1,190 @@
 defmodule Cannery.ActivityLogTest do
-  use Cannery.DataCase
+  @moduledoc """
+  This module tests the ActivityLog context
+  """
 
-  alias Cannery.ActivityLog
+  use Cannery.DataCase
+  import Cannery.Fixtures
+
+  alias Cannery.{
+    ActivityLog,
+    ActivityLog.ShotGroup,
+    Ammo,
+    Containers
+  }
+
+  @moduletag :activity_log_test
 
   describe "shot_groups" do
-    alias Cannery.ActivityLog.ShotGroup
+    setup do
+      current_user = user_fixture()
+      container = container_fixture(current_user)
+      ammo_type = ammo_type_fixture(current_user)
 
-    import Cannery.ActivityLogFixtures
+      %{id: ammo_group_id} =
+        ammo_group = ammo_group_fixture(%{"count" => 25}, ammo_type, container, current_user)
 
-    @invalid_attrs %{count: nil, date: nil, notes: nil}
+      shot_group =
+        %{"count" => 5, "date" => ~N[2022-02-13 03:17:00], "notes" => "some notes"}
+        |> shot_group_fixture(current_user, ammo_group)
 
-    test "list_shot_groups/0 returns all shot_groups" do
-      shot_group = shot_group_fixture()
-      assert ActivityLog.list_shot_groups() == [shot_group]
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
+
+      [
+        current_user: current_user,
+        container: container,
+        ammo_type: ammo_type,
+        ammo_group: ammo_group,
+        shot_group: shot_group
+      ]
     end
 
-    test "get_shot_group!/1 returns the shot_group with given id" do
-      shot_group = shot_group_fixture()
-      assert ActivityLog.get_shot_group!(shot_group.id) == shot_group
+    test "list_shot_groups/0 returns all shot_groups",
+         %{shot_group: shot_group, current_user: current_user} do
+      assert ActivityLog.list_shot_groups(current_user) == [shot_group]
     end
 
-    test "create_shot_group/1 with valid data creates a shot_group" do
-      valid_attrs = %{count: 42, date: ~N[2022-02-13 03:17:00], notes: "some notes"}
+    test "get_shot_group!/1 returns the shot_group with given id",
+         %{shot_group: shot_group, current_user: current_user} do
+      assert ActivityLog.get_shot_group!(shot_group.id, current_user) == shot_group
+    end
 
-      assert {:ok, %ShotGroup{} = shot_group} = ActivityLog.create_shot_group(valid_attrs)
-      assert shot_group.count == 42
-      assert shot_group.date == ~N[2022-02-13 03:17:00]
+    test "get_shot_group!/1 does not return a shot_group of another user",
+         %{shot_group: shot_group, current_user: current_user} do
+      another_user = user_fixture()
+
+      assert_raise Ecto.NoResultsError, fn ->
+        ActivityLog.get_shot_group!(shot_group.id, another_user)
+      end
+    end
+
+    test "create_shot_group/1 with valid data creates a shot_group",
+         %{current_user: current_user, ammo_group: ammo_group} do
+      valid_attrs = %{"count" => 10, "date" => ~D[2022-02-13], "notes" => "some notes"}
+
+      assert {:ok, %ShotGroup{} = shot_group} =
+               ActivityLog.create_shot_group(valid_attrs, current_user, ammo_group)
+
+      assert shot_group.count == 10
+      assert shot_group.date == ~D[2022-02-13]
       assert shot_group.notes == "some notes"
     end
 
-    test "create_shot_group/1 with invalid data returns error changeset" do
-      assert {:error, %Ecto.Changeset{}} = ActivityLog.create_shot_group(@invalid_attrs)
-    end
-
-    test "update_shot_group/2 with valid data updates the shot_group" do
-      shot_group = shot_group_fixture()
-      update_attrs = %{count: 43, date: ~N[2022-02-14 03:17:00], notes: "some updated notes"}
+    test "create_shot_group/1 removes corresponding count from ammo group",
+         %{
+           current_user: current_user,
+           ammo_group: %{id: ammo_group_id, count: org_count} = ammo_group
+         } do
+      valid_attrs = %{"count" => 10, "date" => ~D[2022-02-13], "notes" => "some notes"}
 
       assert {:ok, %ShotGroup{} = shot_group} =
-               ActivityLog.update_shot_group(shot_group, update_attrs)
+               ActivityLog.create_shot_group(valid_attrs, current_user, ammo_group)
 
-      assert shot_group.count == 43
-      assert shot_group.date == ~N[2022-02-14 03:17:00]
-      assert shot_group.notes == "some updated notes"
+      %{count: new_count} = ammo_group_id |> Ammo.get_ammo_group!(current_user)
+
+      assert org_count - shot_group.count == new_count
+      assert new_count == 10
     end
 
-    test "update_shot_group/2 with invalid data returns error changeset" do
-      shot_group = shot_group_fixture()
+    test "create_shot_group/1 does not remove more than ammo group amount",
+         %{
+           current_user: current_user,
+           ammo_group: %{id: ammo_group_id, count: org_count} = ammo_group
+         } do
+      valid_attrs = %{"count" => 20, "date" => ~D[2022-02-13], "notes" => "some notes"}
+
+      assert {:ok, %ShotGroup{} = shot_group} =
+               ActivityLog.create_shot_group(valid_attrs, current_user, ammo_group)
+
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
+
+      assert ammo_group.count == 0
 
       assert {:error, %Ecto.Changeset{}} =
-               ActivityLog.update_shot_group(shot_group, @invalid_attrs)
-
-      assert shot_group == ActivityLog.get_shot_group!(shot_group.id)
+               ActivityLog.create_shot_group(%{"count" => 1}, current_user, ammo_group)
     end
 
-    test "delete_shot_group/1 deletes the shot_group" do
-      shot_group = shot_group_fixture()
-      assert {:ok, %ShotGroup{}} = ActivityLog.delete_shot_group(shot_group)
-      assert_raise Ecto.NoResultsError, fn -> ActivityLog.get_shot_group!(shot_group.id) end
+    test "create_shot_group/1 with invalid data returns error changeset",
+         %{current_user: current_user, ammo_group: ammo_group} do
+      invalid_params = %{"count" => nil, "date" => nil, "notes" => nil}
+
+      assert {:error, %Ecto.Changeset{}} =
+               ActivityLog.create_shot_group(invalid_params, current_user, ammo_group)
     end
 
-    test "change_shot_group/1 returns a shot_group changeset" do
-      shot_group = shot_group_fixture()
+    test "update_shot_group/2 with valid data updates the shot_group and ammo_group",
+         %{
+           shot_group: shot_group,
+           ammo_group: %{id: ammo_group_id} = ammo_group,
+           current_user: current_user
+         } do
+      assert {:ok, %ShotGroup{} = shot_group} =
+               ActivityLog.update_shot_group(
+                 shot_group,
+                 %{
+                   "count" => 10,
+                   "date" => ~D[2022-02-13],
+                   "notes" => "some updated notes"
+                 },
+                 current_user
+               )
+
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
+
+      assert shot_group.count == 10
+      assert ammo_group.count == 15
+      assert shot_group.date == ~D[2022-02-13]
+      assert shot_group.notes == "some updated notes"
+
+      assert {:ok, %ShotGroup{} = shot_group} =
+               ActivityLog.update_shot_group(
+                 shot_group,
+                 %{
+                   "count" => 25,
+                   "date" => ~D[2022-02-13],
+                   "notes" => "some updated notes"
+                 },
+                 current_user
+               )
+
+      ammo_group = ammo_group_id |> Ammo.get_ammo_group!(current_user)
+
+      assert shot_group.count == 25
+      assert ammo_group.count == 0
+    end
+
+    test "update_shot_group/2 with invalid data returns error changeset",
+         %{shot_group: shot_group, current_user: current_user} do
+      assert {:error, %Ecto.Changeset{}} =
+               ActivityLog.update_shot_group(
+                 shot_group,
+                 %{"count" => 26, "date" => nil, "notes" => nil},
+                 current_user
+               )
+
+      assert {:error, %Ecto.Changeset{}} =
+               ActivityLog.update_shot_group(
+                 shot_group,
+                 %{"count" => -1, "date" => nil, "notes" => nil},
+                 current_user
+               )
+
+      assert shot_group == ActivityLog.get_shot_group!(shot_group.id, current_user)
+    end
+
+    test "delete_shot_group/1 deletes the shot_group and adds value back",
+         %{shot_group: shot_group, current_user: current_user, ammo_group: %{id: ammo_group_id}} do
+      assert {:ok, %ShotGroup{}} = ActivityLog.delete_shot_group(shot_group, current_user)
+
+      assert %{count: 25} = ammo_group_id |> Ammo.get_ammo_group!(current_user)
+
+      assert_raise Ecto.NoResultsError, fn ->
+        ActivityLog.get_shot_group!(shot_group.id, current_user)
+      end
+    end
+
+    test "change_shot_group/1 returns a shot_group changeset",
+         %{shot_group: shot_group} do
       assert %Ecto.Changeset{} = ActivityLog.change_shot_group(shot_group)
     end
   end