diff --git a/bookwyrm/tests/views/__init__.py b/bookwyrm/tests/views/__init__.py
new file mode 100644
index 00000000..b6e690fd
--- /dev/null
+++ b/bookwyrm/tests/views/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index 436dbf68..89716a48 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -45,7 +45,8 @@ class ReadingViews(TestCase):
             'start_date': '2020-01-05',
         })
         request.user = self.local_user
-        views.start_reading(request, self.book.id)
+        with patch('bookwyrm.broadcast.broadcast_task.delay'):
+            views.start_reading(request, self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
 
@@ -73,7 +74,8 @@ class ReadingViews(TestCase):
 
         request = self.factory.post('')
         request.user = self.local_user
-        views.start_reading(request, self.book.id)
+        with patch('bookwyrm.broadcast.broadcast_task.delay'):
+            views.start_reading(request, self.book.id)
 
         self.assertFalse(to_read_shelf.books.exists())
         self.assertEqual(shelf.books.get(), self.book)
@@ -95,7 +97,9 @@ class ReadingViews(TestCase):
             'id': readthrough.id,
         })
         request.user = self.local_user
-        views.finish_reading(request, self.book.id)
+
+        with patch('bookwyrm.broadcast.broadcast_task.delay'):
+            views.finish_reading(request, self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
 
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 64966a77..35e07953 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -74,7 +74,7 @@ class ShelfViews(TestCase):
                 'name': 'To Read',
             })
         request.user = self.local_user
-        view(request, self.local_user.username, shelf.id)
+        view(request, self.local_user.username, shelf.identifier)
         shelf.refresh_from_db()
 
         self.assertEqual(shelf.privacy, 'unlisted')
@@ -94,7 +94,7 @@ class ShelfViews(TestCase):
                 'name': 'cool name'
             })
         request.user = self.local_user
-        view(request, request.user.username, shelf.id)
+        view(request, request.user.username, shelf.identifier)
         shelf.refresh_from_db()
 
         self.assertEqual(shelf.name, 'cool name')
@@ -114,7 +114,7 @@ class ShelfViews(TestCase):
                 'name': 'cool name'
             })
         request.user = self.local_user
-        view(request, request.user.username, shelf.id)
+        view(request, request.user.username, shelf.identifier)
 
         self.assertEqual(shelf.name, 'To Read')
 
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 6e0c73df..50c458ac 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -176,7 +176,8 @@ class StatusViews(TestCase):
         reply = models.Status.replies(status).first()
         self.assertEqual(reply.content, '<p>right</p>')
         self.assertEqual(reply.user, user)
-        self.assertTrue(self.remote_user in reply.mention_users.all())
+        # the mentioned user in the parent post is only included if @'ed
+        self.assertFalse(self.remote_user in reply.mention_users.all())
         self.assertTrue(self.local_user in reply.mention_users.all())
 
     def test_find_mentions(self):
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 565fc179..c2c72509 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -30,8 +30,8 @@ def start_reading(request, book_id):
     if readthrough:
         readthrough.save()
 
-    # create a progress update if we have a page
-    readthrough.create_update()
+        # create a progress update if we have a page
+        readthrough.create_update()
 
     # shelve the book
     if request.POST.get('reshelve', True):
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 15b2bd28..ae8a494b 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -65,6 +65,7 @@ class Shelf(View):
         return TemplateResponse(request, 'shelf.html', data)
 
     @method_decorator(login_required, name='dispatch')
+    # pylint: disable=unused-argument
     def post(self, request, username, shelf_identifier):
         ''' edit a shelf '''
         try:
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 668ef205..4afda01b 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -73,7 +73,7 @@ class User(View):
         activities = get_activity_feed(
             request.user,
             ['public', 'unlisted', 'followers'],
-            queryset=models.Status.objects.filter(user=user)
+            queryset=user.status_set
         )
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(