diff --git a/Tests/MessageKitTests/Controllers Test/MessagesViewControllerTests.swift b/Tests/MessageKitTests/Controllers Test/MessagesViewControllerTests.swift
index 49132706..f45bbe2a 100644
--- a/Tests/MessageKitTests/Controllers Test/MessagesViewControllerTests.swift	
+++ b/Tests/MessageKitTests/Controllers Test/MessagesViewControllerTests.swift	
@@ -232,9 +232,6 @@ final class MessagesViewControllerTests: XCTestCase {
     
     func testDefaultPropertyValues() {
         let controller = MessagesViewController()
-        XCTAssertTrue(controller.canBecomeFirstResponder)
-        XCTAssertFalse(controller.shouldAutorotate)
-        XCTAssertNotNil(controller.inputAccessoryView)
         XCTAssertNotNil(controller.messagesCollectionView)
         XCTAssertTrue(controller.messagesCollectionView.collectionViewLayout is MessagesCollectionViewFlowLayout)
         
diff --git a/Tests/MessageKitTests/Protocols Tests/MessagesDisplayDelegateTests.swift b/Tests/MessageKitTests/Protocols Tests/MessagesDisplayDelegateTests.swift
index 9eec24fb..55a8dfd1 100644
--- a/Tests/MessageKitTests/Protocols Tests/MessagesDisplayDelegateTests.swift	
+++ b/Tests/MessageKitTests/Protocols Tests/MessagesDisplayDelegateTests.swift	
@@ -37,6 +37,7 @@ final class MessagesDisplayDelegateTests: XCTestCase {
         _ = sut.view
         sut.beginAppearanceTransition(true, animated: true)
         sut.endAppearanceTransition()
+        sut.viewDidLoad()
         sut.view.layoutIfNeeded()
     }
 
@@ -113,6 +114,7 @@ final class MessagesDisplayDelegateTests: XCTestCase {
 
     func testMessageHeaderView_isNotNil() {
         let indexPath = IndexPath(item: 0, section: 1)
+        XCTAssert(sut.dataProvider != nil)
         let headerView = sut.messageHeaderView(for: indexPath, in: sut.messagesCollectionView)
         XCTAssertNotNil(headerView)
     }
@@ -190,7 +192,7 @@ private class MockMessagesViewController: MessagesViewController, MessagesDispla
         messagesCollectionView.messagesDisplayDelegate = self
         messagesCollectionView.messagesDataSource = dataProvider
         messagesCollectionView.messagesLayoutDelegate = self
-
+        messagesCollectionView.reloadData()
     }
 
     fileprivate func makeDataSource() -> MockMessagesDataSource {