diff --git a/.circleci/config.yml b/.circleci/config.yml
index 47a16fb1..e4c9ab21 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
   build-and-test:
 
     environment:
-      - DESTINATION: "platform=iOS Simulator,name=iPhone XR"
+      - DESTINATION: "platform=iOS Simulator,name=iPhone XS"
 
     # Specify the Xcode version to use.
     macos:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c28db709..b322ee96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ The changelog for `MessageKit`. Also see the [releases](https://github.com/Messa
 
 --------------------------------------
 
-## Upcoming Release
+## [2.0.0](https://github.com/MessageKit/MessageKit/releases/tag/2.0.0)
 
 ### Changed
 
diff --git a/MessageKit.podspec b/MessageKit.podspec
index b013f0d8..0d2e1b65 100644
--- a/MessageKit.podspec
+++ b/MessageKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = 'MessageKit'
-   s.version = '2.0.0-beta.1'
+   s.version = '2.0.0'
    s.license = { :type => "MIT", :file => "LICENSE.md" }
 
    s.summary = 'An elegant messages UI library for iOS.'
diff --git a/Tests/ControllersTest/MessagesViewControllerSpec.swift b/Tests/ControllersTest/MessagesViewControllerSpec.swift
index cf3c981b..1cf4d565 100644
--- a/Tests/ControllersTest/MessagesViewControllerSpec.swift
+++ b/Tests/ControllersTest/MessagesViewControllerSpec.swift
@@ -56,6 +56,9 @@ final class MessagesViewControllerSpec: QuickSpec {
                 it("has a MessagesCollectionView") {
                     expect(controller.messagesCollectionView).toNot(beNil())
                 }
+                it("sets the CollectionView's layout to be an instance of MessagesCollectionViewFlowLayout") {
+                    expect(controller.messagesCollectionView.collectionViewLayout).to(beAnInstanceOf(MessagesCollectionViewFlowLayout.self))
+                }
             }
             context("after viewDidLoad") {
                 beforeEach {
diff --git a/Tests/ControllersTest/MessagesViewControllerTests.swift b/Tests/ControllersTest/MessagesViewControllerTests.swift
index 95b743ec..fb30c51f 100644
--- a/Tests/ControllersTest/MessagesViewControllerTests.swift
+++ b/Tests/ControllersTest/MessagesViewControllerTests.swift
@@ -55,18 +55,6 @@ class MessagesViewControllerTests: XCTestCase {
 
     // MARK: - Test
 
-    func testMessageCollectionViewLayout_isMessageCollectionViewLayout() {
-        XCTAssertNotNil(sut.messagesCollectionView.collectionViewLayout)
-        XCTAssertTrue(sut.messagesCollectionView.collectionViewLayout is MessagesCollectionViewFlowLayout)
-    }
-
-    func testMessageCollectionView_hasMessageCollectionFlowLayoutAfterViewDidLoad() {
-        let layout = sut.messagesCollectionView.collectionViewLayout
-
-        XCTAssertNotNil(layout)
-        XCTAssertTrue(layout is MessagesCollectionViewFlowLayout)
-    }
-
     func testViewDidLoad_shouldSetDelegateAndDataSourceToTheSameObject() {
         XCTAssertEqual(sut.messagesCollectionView.delegate as? MessagesViewController,
                        sut.messagesCollectionView.dataSource as? MessagesViewController)