diff --git a/auctions/models.py b/auctions/models.py
index 28ba1d6..185edf9 100644
--- a/auctions/models.py
+++ b/auctions/models.py
@@ -75,3 +75,7 @@ class Watchlist(models.Model):
 
     def __str__(self):
         return f"{self.user} added {self.listing.title} to watchlist"
+
+    def toggle(self):
+        self.active = not self.active
+        self.save()
diff --git a/auctions/templates/auctions/auction.html b/auctions/templates/auctions/auction.html
index b1ffc5f..feabc76 100644
--- a/auctions/templates/auctions/auction.html
+++ b/auctions/templates/auctions/auction.html
@@ -75,11 +75,11 @@ <h1 class="auction-title">{{ listing.title }}</h1>
                                     <form action="{% url 'watchlist' listing.id %}" method="post" class="d-inline">
                                         {% csrf_token %}
                                         <button type="submit" 
-                                                class="btn btn-outline-heart {% if listing in user.watchlist.all %}active{% endif %}"
-                                                title="{% if listing in user.watchlist.all %}Remove from Watchlist{% else %}Add to Watchlist{% endif %}">
+                                                class="btn btn-outline-heart {% if listing in user.watchlist.filter.active %}active{% endif %}"
+                                                title="{% if listing in user.watchlist.filter.active %}Remove from Watchlist{% else %}Add to Watchlist{% endif %}">
                                             <i class="fas fa-heart"></i>
                                             <span class="watchlist-text">
-                                                {% if listing in user.watchlist.all %}
+                                                {% if listing in user.watchlist.filter.active %}
                                                     In Watchlist
                                                 {% else %}
                                                     Add to Watchlist
diff --git a/auctions/templates/auctions/categories.html b/auctions/templates/auctions/categories.html
index 5ba6714..7ec7467 100644
--- a/auctions/templates/auctions/categories.html
+++ b/auctions/templates/auctions/categories.html
@@ -76,7 +76,7 @@ <h3>No listings found</h3>
                     <p>{{ selected_category|default:"No" }} items are currently available</p>
                     {% if user.is_authenticated %}
                     <div class="empty-actions">
-                        <a href="{% url 'addAuctions' %}" class="btn btn-primary btn-lg">
+                        <a href="{% url 'new_auction' %}" class="btn btn-primary btn-lg">
                             <i class="fas fa-plus-circle"></i>Create New Auction
                         </a>
                     </div>
diff --git a/auctions/templates/auctions/components/footer.html b/auctions/templates/auctions/components/footer.html
index 5c053dd..d3667ac 100644
--- a/auctions/templates/auctions/components/footer.html
+++ b/auctions/templates/auctions/components/footer.html
@@ -42,7 +42,7 @@ <h5 class="footer-heading">Quick Links</h5>
 						</a>
 					</li>
 					<li>
-						<a href="{% url 'addAuctions' %}">
+						<a href="{% url 'new_auction' %}">
 							<i class="fas fa-plus-circle me-2"></i>Create
 							Listing
 						</a>
diff --git a/auctions/templates/auctions/index.html b/auctions/templates/auctions/index.html
index f7a06ce..885b0b7 100644
--- a/auctions/templates/auctions/index.html
+++ b/auctions/templates/auctions/index.html
@@ -14,7 +14,7 @@ <h2 class="display-5 display-md-4 fw-bold">
             </div>
             {% if user.is_authenticated %}
             <div class="col-12 col-md-auto mt-2 mt-md-0">
-                <a href="{% url 'addAuctions' %}" class="btn btn-primary btn-lg d-flex align-items-center justify-content-center justify-content-md-start">
+                <a href="{% url 'new_auction' %}" class="btn btn-primary btn-lg d-flex align-items-center justify-content-center justify-content-md-start">
                     <i class="fas fa-plus-circle me-2"></i>Create New Auction
                 </a>
             </div>
@@ -78,7 +78,7 @@ <h2 class="display-5 display-md-4 fw-bold">
                     <h3 class="h4 fw-bold">No active listings at the moment</h3>
                     <p class=" mb-4">Be the first to create an auction and start earning!</p>
                     {% if user.is_authenticated %}
-                        <a href="{% url 'addAuctions' %}" class="btn btn-primary btn-lg">
+                        <a href="{% url 'new_auction' %}" class="btn btn-primary btn-lg">
                             <i class="fas fa-plus-circle me-2"></i>Create New Auction
                         </a>
                     {% else %}
diff --git a/auctions/templates/auctions/newAuctions.html b/auctions/templates/auctions/newAuctions.html
index 73b810f..0ff5f8d 100644
--- a/auctions/templates/auctions/newAuctions.html
+++ b/auctions/templates/auctions/newAuctions.html
@@ -13,7 +13,7 @@ <h2 class="card-title text-center mb-4">
                             <i class="fas fa-plus-circle text-primary me-2"></i>Create New Auction
                         </h2>
                         
-                        <form action="{% url 'addAuctions' %}" method="post" id="form-auction" class="needs-validation">
+                        <form action="{% url 'new_auction' %}" method="post" id="form-auction" class="needs-validation">
                             {% csrf_token %}
                             
                             <div class="form-group mb-4">
diff --git a/auctions/tests.py b/auctions/tests.py
deleted file mode 100644
index 2327c73..0000000
--- a/auctions/tests.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your tests here.
diff --git a/auctions/tests/__init__.py b/auctions/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/auctions/tests/factories.py b/auctions/tests/factories.py
new file mode 100644
index 0000000..d2808c0
--- /dev/null
+++ b/auctions/tests/factories.py
@@ -0,0 +1,52 @@
+import factory
+from factory.django import DjangoModelFactory
+from auctions.models import User, Listing, Bid, Comment, Watchlist
+
+
+class UserFactory(DjangoModelFactory):
+    class Meta:
+        model = User
+        django_get_or_create = ("username",)
+
+    username = factory.Faker("user_name")
+    email = factory.Faker("email")
+    password = factory.PostGenerationMethodCall("set_password", "testpassword")
+
+
+class ListingFactory(DjangoModelFactory):
+    class Meta:
+        model = Listing
+
+    title = factory.Faker("sentence", nb_words=4)
+    description = factory.Faker("text")
+    starting_bid = factory.Faker(
+        "pydecimal", left_digits=3, right_digits=2, positive=True
+    )
+    user = factory.SubFactory(UserFactory)
+
+
+class BidFactory(DjangoModelFactory):
+    class Meta:
+        model = Bid
+
+    amount = factory.Faker("pydecimal", left_digits=3, right_digits=2, positive=True)
+    user = factory.SubFactory(UserFactory)
+    listing = factory.SubFactory(ListingFactory)
+
+
+class CommentFactory(DjangoModelFactory):
+    class Meta:
+        model = Comment
+
+    text = factory.Faker("text")
+    user = factory.SubFactory(UserFactory)
+    listing = factory.SubFactory(ListingFactory)
+
+
+class WatchlistFactory(DjangoModelFactory):
+    class Meta:
+        model = Watchlist
+
+    user = factory.SubFactory(UserFactory)
+    listing = factory.SubFactory(ListingFactory)
+    active = True
diff --git a/auctions/tests/test_forms.py b/auctions/tests/test_forms.py
new file mode 100644
index 0000000..59747c4
--- /dev/null
+++ b/auctions/tests/test_forms.py
@@ -0,0 +1,94 @@
+from django.test import TestCase
+from auctions.forms import ListingForm, BidForm, CommentForm
+from .factories import UserFactory
+
+
+class ListingFormTest(TestCase):
+    def test_valid_form(self):
+        user = UserFactory()
+        form_data = {
+            "title": "Test Listing",
+            "description": "This is a test description.",
+            "starting_bid": 10.00,
+            "image": "http://example.com/image.jpg",
+            "category": "Other",
+        }
+        form = ListingForm(data=form_data)
+        self.assertTrue(form.is_valid())
+
+    def test_empty_title(self):
+        form_data = {"title": ""}
+        form = ListingForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("title", form.errors)
+
+    def test_duplicate_title(self):
+        user = UserFactory()
+        from auctions.models import Listing
+
+        Listing.objects.create(title="Test Listing", user=user, starting_bid=10.00)
+        form_data = {"title": "Test Listing"}
+        form = ListingForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("title", form.errors)
+
+    def test_empty_description(self):
+        form_data = {"description": ""}
+        form = ListingForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("description", form.errors)
+
+    def test_empty_starting_bid(self):
+        form_data = {"starting_bid": None}
+        form = ListingForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("starting_bid", form.errors)
+
+    def test_negative_starting_bid(self):
+        form_data = {"starting_bid": -10.00}
+        form = ListingForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("starting_bid", form.errors)
+
+    def test_invalid_image_url(self):
+        form_data = {"image": "not a url"}
+        form = ListingForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("image", form.errors)
+
+
+class BidFormTest(TestCase):
+    def test_valid_form(self):
+        form_data = {"amount": 10.00}
+        form = BidForm(data=form_data)
+        self.assertTrue(form.is_valid())
+
+    def test_empty_amount(self):
+        form_data = {"amount": None}
+        form = BidForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("amount", form.errors)
+
+    def test_zero_amount(self):
+        form_data = {"amount": 0}
+        form = BidForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("amount", form.errors)
+
+    def test_negative_amount(self):
+        form_data = {"amount": -10.00}
+        form = BidForm(data=form_data)
+        self.assertFalse(form.is_valid())
+        self.assertIn("amount", form.errors)
+
+
+class CommentFormTest(TestCase):
+    def test_valid_form(self):
+        form_data = {"text": "This is a test comment."}
+        form = CommentForm(data=form_data)
+        self.assertTrue(form.is_valid())
+
+    def test_empty_text(self):
+        form_data = {"text": ""}
+        form = CommentForm(data=form_data)
+        self.assertTrue(form.is_valid())  # empty comment is allowed
diff --git a/auctions/tests/test_integration.py b/auctions/tests/test_integration.py
new file mode 100644
index 0000000..3947188
--- /dev/null
+++ b/auctions/tests/test_integration.py
@@ -0,0 +1,49 @@
+from decimal import Decimal
+from django.test import TestCase, Client
+from django.urls import reverse
+from auctions.models import User, Listing
+from .factories import UserFactory
+
+
+class AuctionFlowTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user1 = UserFactory(username="user1")
+        self.user1.set_password("testpassword")
+        self.user1.save()
+        self.user2 = UserFactory(username="user2")
+        self.user2.set_password("testpassword")
+        self.user2.save()
+
+    def test_full_auction_flow(self):
+        # 1. user1 creates a listing
+        self.client.login(username="user1", password="testpassword")
+        response = self.client.post(
+            reverse("new_auction"),
+            {
+                "title": "Integration Test Listing",
+                "description": "A listing for integration testing.",
+                "starting_bid": "10.00",
+                "category": "Other",
+            },
+        )
+        self.assertEqual(response.status_code, 302)
+        listing = Listing.objects.get(title="Integration Test Listing")
+        self.assertEqual(listing.user, self.user1)
+
+        # 2. user2 places a bid
+        self.client.login(username="user2", password="testpassword")
+        response = self.client.post(
+            reverse("bid", args=[listing.id]), {"amount": "15.00"}
+        )
+        self.assertEqual(response.status_code, 302)
+        listing.refresh_from_db()
+        self.assertEqual(listing.current_bid, Decimal("15.00"))
+
+        # 3. user1 closes the auction
+        self.client.login(username="user1", password="testpassword")
+        response = self.client.post(reverse("close_auction", args=[listing.id]))
+        self.assertEqual(response.status_code, 302)
+        listing.refresh_from_db()
+        self.assertFalse(listing.active)
+        self.assertEqual(listing.winner, self.user2)
diff --git a/auctions/tests/test_models.py b/auctions/tests/test_models.py
new file mode 100644
index 0000000..f148431
--- /dev/null
+++ b/auctions/tests/test_models.py
@@ -0,0 +1,78 @@
+from decimal import Decimal
+from django.core.exceptions import ValidationError
+from django.test import TestCase
+from auctions.models import Listing, Bid, Comment, Watchlist
+from .factories import (
+    UserFactory,
+    ListingFactory,
+    BidFactory,
+    CommentFactory,
+    WatchlistFactory,
+)
+
+
+class ListingModelTest(TestCase):
+    def test_string_representation(self):
+        listing = ListingFactory(title="My Test Listing", starting_bid=Decimal("10.00"))
+        self.assertEqual(str(listing), "My Test Listing - 10.00")
+
+    def test_place_bid_successfully(self):
+        listing = ListingFactory(
+            starting_bid=Decimal("10.00"), current_bid=Decimal("10.00")
+        )
+        user = UserFactory()
+        listing.place_bid(user, Decimal("12.00"))
+        self.assertEqual(listing.current_bid, Decimal("12.00"))
+        self.assertEqual(listing.bids.count(), 1)
+        self.assertEqual(listing.bids.first().user, user)
+        self.assertEqual(listing.bids.first().amount, Decimal("12.00"))
+
+    def test_place_bid_with_lower_amount(self):
+        listing = ListingFactory(
+            starting_bid=Decimal("10.00"), current_bid=Decimal("12.00")
+        )
+        user = UserFactory()
+        with self.assertRaises(ValidationError):
+            listing.place_bid(user, Decimal("11.00"))
+
+    def test_place_bid_with_equal_amount(self):
+        listing = ListingFactory(
+            starting_bid=Decimal("10.00"), current_bid=Decimal("12.00")
+        )
+        user = UserFactory()
+        with self.assertRaises(ValidationError):
+            listing.place_bid(user, Decimal("12.00"))
+
+
+class BidModelTest(TestCase):
+    def test_string_representation(self):
+        user = UserFactory(username="testuser")
+        listing = ListingFactory(title="Test Listing")
+        bid = BidFactory(user=user, listing=listing, amount=Decimal("15.00"))
+        self.assertEqual(str(bid), "testuser bid 15.00 on Test Listing")
+
+
+class CommentModelTest(TestCase):
+    def test_string_representation(self):
+        user = UserFactory(username="commenter")
+        listing = ListingFactory(title="Another Listing")
+        comment = CommentFactory(user=user, listing=listing)
+        self.assertEqual(str(comment), "commenter commented on Another Listing")
+
+
+class WatchlistModelTest(TestCase):
+    def test_string_representation(self):
+        user = UserFactory(username="watcher")
+        listing = ListingFactory(title="Watchlist Item")
+        watchlist_item = WatchlistFactory(user=user, listing=listing)
+        self.assertEqual(
+            str(watchlist_item), "watcher added Watchlist Item to watchlist"
+        )
+
+    def test_toggle_watchlist(self):
+        watchlist_item = WatchlistFactory(active=True)
+        self.assertTrue(watchlist_item.active)
+        watchlist_item.toggle()
+        self.assertFalse(watchlist_item.active)
+        watchlist_item.toggle()
+        self.assertTrue(watchlist_item.active)
diff --git a/auctions/tests/test_templates.py b/auctions/tests/test_templates.py
new file mode 100644
index 0000000..7abb7e8
--- /dev/null
+++ b/auctions/tests/test_templates.py
@@ -0,0 +1,24 @@
+from django.test import TestCase, Client
+from django.urls import reverse
+from .factories import ListingFactory, UserFactory
+
+
+class TemplateTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+
+    def test_index_template_displays_listings(self):
+        ListingFactory.create_batch(3, title="Test Listing")
+        response = self.client.get(reverse("index"))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Test Listing", count=6)
+
+    def test_auction_template_displays_listing_details(self):
+        listing = ListingFactory(
+            title="Detailed Listing", description="Detailed description."
+        )
+        response = self.client.get(reverse("listing", args=[listing.id]))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Detailed Listing")
+        self.assertContains(response, "Detailed description.")
diff --git a/auctions/tests/test_views.py b/auctions/tests/test_views.py
new file mode 100644
index 0000000..74ac73b
--- /dev/null
+++ b/auctions/tests/test_views.py
@@ -0,0 +1,188 @@
+from django.test import TestCase, Client
+from django.urls import reverse
+from auctions.models import User, Listing
+from .factories import UserFactory, ListingFactory
+
+
+class IndexViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    def test_index_view(self):
+        response = self.client.get(reverse("index"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "auctions/index.html")
+
+    def test_index_view_with_listings(self):
+        ListingFactory.create_batch(5)
+        response = self.client.get(reverse("index"))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.context["listings"]), 5)
+
+
+class AuthViewsTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory(username="testuser")
+        self.user.set_password("testpassword")
+        self.user.save()
+
+    def test_login_view(self):
+        response = self.client.post(
+            reverse("login"), {"username": "testuser", "password": "testpassword"}
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("index"))
+        self.assertTrue(response.wsgi_request.user.is_authenticated)
+
+    def test_login_view_invalid_credentials(self):
+        response = self.client.post(
+            reverse("login"), {"username": "testuser", "password": "wrongpassword"}
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "auctions/login.html")
+        self.assertFalse(response.wsgi_request.user.is_authenticated)
+
+    def test_logout_view(self):
+        self.client.login(username="testuser", password="testpassword")
+        response = self.client.get(reverse("logout"))
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("index"))
+        self.assertFalse(response.wsgi_request.user.is_authenticated)
+
+    def test_register_view(self):
+        response = self.client.post(
+            reverse("register"),
+            {
+                "username": "newuser",
+                "email": "newuser@example.com",
+                "password": "newpassword",
+                "confirmation": "newpassword",
+            },
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("index"))
+        self.assertTrue(response.wsgi_request.user.is_authenticated)
+        self.assertEqual(User.objects.count(), 2)
+
+    def test_register_view_password_mismatch(self):
+        response = self.client.post(
+            reverse("register"),
+            {
+                "username": "newuser",
+                "email": "newuser@example.com",
+                "password": "newpassword",
+                "confirmation": "wrongpassword",
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "auctions/register.html")
+        self.assertFalse(response.wsgi_request.user.is_authenticated)
+        self.assertEqual(User.objects.count(), 1)
+
+
+class ListingViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+        self.listing = ListingFactory(user=self.user)
+
+    def test_listing_view(self):
+        response = self.client.get(reverse("listing", args=[self.listing.id]))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "auctions/auction.html")
+        self.assertEqual(response.context["listing"], self.listing)
+
+
+class NewAuctionViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+        self.client.login(username=self.user.username, password="testpassword")
+
+    def test_new_auction_view_get(self):
+        response = self.client.get(reverse("new_auction"))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "auctions/newAuctions.html")
+
+    def test_new_auction_view_post(self):
+        form_data = {
+            "title": "New Test Listing",
+            "description": "This is a new test description.",
+            "starting_bid": 20.00,
+            "image": "http://example.com/new_image.jpg",
+            "category": "Home",
+        }
+        response = self.client.post(reverse("new_auction"), form_data)
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("index"))
+        self.assertTrue(Listing.objects.filter(title="New Test Listing").exists())
+
+
+from decimal import Decimal
+
+
+class BidViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+        self.listing = ListingFactory(
+            starting_bid=Decimal("10.00"), current_bid=Decimal("10.00")
+        )
+        self.client.login(username=self.user.username, password="testpassword")
+
+    def test_bid_view_post(self):
+        response = self.client.post(
+            reverse("bid", args=[self.listing.id]), {"amount": "12.00"}
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("listing", args=[self.listing.id]))
+        self.listing.refresh_from_db()
+        self.assertEqual(self.listing.current_bid, Decimal("12.00"))
+
+
+class WatchlistViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+        self.listing = ListingFactory()
+        self.client.login(username=self.user.username, password="testpassword")
+
+    def test_watchlist_add(self):
+        response = self.client.post(reverse("watchlist", args=[self.listing.id]))
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("listing", args=[self.listing.id]))
+        self.assertTrue(
+            self.user.watchlist.filter(listing=self.listing, active=True).exists()
+        )
+
+
+class CloseAuctionViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+        self.listing = ListingFactory(user=self.user)
+        self.client.login(username=self.user.username, password="testpassword")
+
+    def test_close_auction(self):
+        response = self.client.post(reverse("close_auction", args=[self.listing.id]))
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("listing", args=[self.listing.id]))
+        self.listing.refresh_from_db()
+        self.assertFalse(self.listing.active)
+
+
+class CommentViewTest(TestCase):
+    def setUp(self):
+        self.client = Client()
+        self.user = UserFactory()
+        self.listing = ListingFactory()
+        self.client.login(username=self.user.username, password="testpassword")
+
+    def test_comment_view_post(self):
+        response = self.client.post(
+            reverse("comment", args=[self.listing.id]), {"text": "Test comment"}
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("listing", args=[self.listing.id]))
+        self.assertTrue(self.listing.comments.filter(text="Test comment").exists())
diff --git a/auctions/views.py b/auctions/views.py
index 70341fe..6df5e9a 100644
--- a/auctions/views.py
+++ b/auctions/views.py
@@ -79,9 +79,9 @@ def new_auctions(request):
         form = ListingForm(request.POST)
         if form.is_valid():
             # Set the logged-in user
-            listing = form.save(commit=False)  # Don't save yet
-            listing.user = request.user  # Set the user
-            listing.save()  # Now save the Listing}
+            new_listing = form.save(commit=False)  # Don't save yet
+            new_listing.user = request.user  # Set the user
+            new_listing.save()  # Now save the Listing
             messages.success(request, "Your listing has been created.")
             return redirect("index")
         messages.error(request, "There was an error with created your listing.")
@@ -112,7 +112,7 @@ def listing(request, listing_id):
 @login_required
 def bid(request, listing_id):
     auction = get_object_or_404(Listing, pk=listing_id)
-    comment_auction = auction.comments.all().count()
+    bid_count = auction.bids.count()
     if request.method == "POST":
         bid_form = BidForm(request.POST)
         if bid_form.is_valid():
@@ -122,7 +122,7 @@ def bid(request, listing_id):
                 messages.success(request, "Your bid has been placed successfully.")
                 messages.info(
                     request,
-                    f"({comment_auction}) bid(s) so far. Your bid is the current bid.",
+                    f"({bid_count + 1}) bid(s) so far. Your bid is the current bid.",
                 )
                 return redirect("listing", listing_id=listing_id)
             except ValidationError as e:
@@ -143,15 +143,16 @@ def bid(request, listing_id):
 def watchlist(request, listing_id):
     user = request.user
     if request.method == "POST":
-        listings_in_watchlist = Watchlist.objects.filter(
-            user=user, listing__id=listing_id
-        )
-        if listings_in_watchlist.exists():
-            listings_in_watchlist.update(active=True)
-            return HttpResponseRedirect(reverse("watchlist", args=[user.id]))
         current_listing = Listing.objects.get(pk=listing_id)
-        Watchlist.objects.create(user=user, listing=current_listing, active=True)
-        return HttpResponseRedirect(reverse("watchlist", args=[user.id]))
+        watchlist_item, created = Watchlist.objects.get_or_create(
+            user=user, listing=current_listing
+        )
+        if created:
+            watchlist_item.active = True
+        else:
+            watchlist_item.active = not watchlist_item.active
+        watchlist_item.save()
+        return HttpResponseRedirect(reverse("listing", args=[listing_id]))
     listings_in_watchlist = Listing.objects.filter(
         watchlist__user=user, watchlist__active=True
     ).order_by("-created")
@@ -171,18 +172,18 @@ def watchlist_remove(request, listing_id):
 
 
 def close_auction(request, listing_id):
-    listing = get_object_or_404(Listing, id=listing_id)
+    auction_listing = get_object_or_404(Listing, id=listing_id)
 
-    if request.user != listing.user:
+    if request.user != auction_listing.user:
         messages.error(request, "You are not authorized to close this auction.")
         return redirect("listing", listing_id=listing_id)
-    highest_bid = listing.bids.order_by("-amount").first()
+    highest_bid = auction_listing.bids.order_by("-amount").first()
     if highest_bid:
-        listing.winner = highest_bid.user
+        auction_listing.winner = highest_bid.user
     else:
         messages.warning(request, "No bids were placed on this listing.")
-    listing.active = False
-    listing.save()
+    auction_listing.active = False
+    auction_listing.save()
     messages.success(request, "The auction has been closed.")
     return redirect("listing", listing_id=listing_id)
 
diff --git a/commerce/settings.py b/commerce/settings.py
index 08e251e..d309e3c 100644
--- a/commerce/settings.py
+++ b/commerce/settings.py
@@ -24,7 +24,7 @@
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.getenv("SECRET_KEY")
+SECRET_KEY = os.getenv("SECRET_KEY", "a-default-secret-key-for-testing")
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.getenv("DEBUG", "False") == "True"
diff --git a/requirements.txt b/requirements.txt
index 71aaa07..8cfeed6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ django-debug-toolbar==4.4.6
 django-heroku==0.3.1
 gunicorn==23.0.0
 packaging==24.2
-psycopg2==2.9.10
+psycopg2-binary==2.9.10
 python-dotenv==1.0.1
 sqlparse==0.5.2
 typing_extensions==4.12.2