                     var postCellItems = parser.parse([post], streamKind: streamKind)
                     let newComment = ElloComment.newCommentForPost(post, currentUser: currentUser)
                     postCellItems += [StreamCellItem(jsonable: newComment, type: .createComment)]
-                    controller.dataSource.appendUnsizedCellItems(postCellItems, withWidth: 320.0) { cellCount in
-                        controller.collectionView.reloadData()
-                    }
+                    controller.dataSource.appendStreamCellItems(postCellItems)
+                    collectionView.fakeIndexPath = IndexPath(item: postCellItems.count - 1, section: 0)
                 }
                 context("tapping replyToAll") {
                     it("opens an OmnibarViewController with usernames set") {
-                        subject.replyToAllButtonTapped(UICollectionViewCell())
+                        subject.replyToAllButtonTapped(cell)
                         expect(responder.text) == "@user1 @user2 "
                     }
                 }
             }
 
             describe("watchPostTapped(_:cell:)") {
-                var cell: StreamCreateCommentCell!
+                let cell = StreamCreateCommentCell()
 
                 beforeEach {
                     let post: Post = stub([

                    var postCellItems = parser.parse([post], streamKind: streamKind)
                    let newComment = ElloComment.newCommentForPost(post, currentUser: currentUser)
                    postCellItems += [StreamCellItem(jsonable: newComment, type: .createComment)]
                    cell = StreamCreateCommentCell()
                    controller.dataSource.appendUnsizedCellItems(postCellItems, withWidth: 320.0) { cellCount in
                        controller.collectionView.reloadData()
                    }
                }

                it("should disable the cell during submission") {

            "lovesCount": 5,
            ])
        var controller: StreamViewController!
        var collectionView: FakeCollectionView!
        let streamKind: StreamKind = .postDetail(postParam: "post")

        beforeEach {
