diff --git a/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/APIClientTests.swift b/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/APIClientTests.swift
index 64bf969..fad16fb 100644
--- a/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/APIClientTests.swift
+++ b/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/APIClientTests.swift
@@ -11,14 +11,13 @@ import XCTest
 @testable import Services
 
 class APIClientTests: XCTestCase {
-    let client: APIClient = {
+    var client: APIClient!
+
+    override func setUp() {
+        super.setUp()
         let configuration = URLSessionConfiguration.default
         OHHTTPStubs.setEnabled(true, for: configuration)
-        let client = APIClient(baseURL: TestClient.baseURL, configuration: configuration)
-        return client
-    }()
-    override class func setUp() {
-        super.setUp()
+        client = APIClient(baseURL: TestClient.baseURL, configuration: configuration)
     }
 
     override func tearDown() {
diff --git a/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/OAuthTests.swift b/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/OAuthTests.swift
index 2d26b5f..473f6c8 100644
--- a/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/OAuthTests.swift
+++ b/PRODUCTNAME/app/PRODUCTNAMETests/OAuth/OAuthTests.swift
@@ -11,7 +11,7 @@ import XCTest
 @testable import Services
 
 class OAuthTests: XCTestCase {
-    override class func setUp() {
+    override func setUp() {
         super.setUp()
         OHHTTPStubs.setEnabled(true)
     }
diff --git a/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/APIClientTests.swift b/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/APIClientTests.swift
index e955b5d..325a905 100644
--- a/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/APIClientTests.swift	
+++ b/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/APIClientTests.swift	
@@ -11,14 +11,13 @@ import XCTest
 @testable import Services
 
 class APIClientTests: XCTestCase {
-    let client: APIClient = {
+    var client: APIClient!
+
+    override func setUp() {
+        super.setUp()
         let configuration = URLSessionConfiguration.default
         OHHTTPStubs.setEnabled(true, for: configuration)
-        let client = APIClient(baseURL: TestClient.baseURL, configuration: configuration)
-        return client
-    }()
-    override class func setUp() {
-        super.setUp()
+        client = APIClient(baseURL: TestClient.baseURL, configuration: configuration)
     }
 
     override func tearDown() {
diff --git a/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/OAuthTests.swift b/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/OAuthTests.swift
index ddf835f..e36944b 100644
--- a/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/OAuthTests.swift	
+++ b/{{ cookiecutter.project_name | replace(' ', '') }}/app/{{ cookiecutter.project_name | replace(' ', '') }}Tests/OAuth/OAuthTests.swift	
@@ -11,7 +11,7 @@ import XCTest
 @testable import Services
 
 class OAuthTests: XCTestCase {
-    override class func setUp() {
+    override func setUp() {
         super.setUp()
         OHHTTPStubs.setEnabled(true)
     }