diff --git a/.swiftlint.yml b/.swiftlint.yml
index 965d20a52..6ca479806 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -1,5 +1,3 @@
 disabled_rules:
 - line_length
 - file_length
-- legacy_constructor
-- xctfail_message
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d789a3451..203bcfe43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,29 @@
 # CHANGELOG
 The changelog for **SwifterSwift**. Also see the [releases](https://github.com/SwifterSwift/SwifterSwift/releases) on GitHub.
 
-> # Upcoming release
->
-> ### Added
+# Upcoming release
+
+### Added
 - **UITableViewExtentions**:
   - Added `isValidIndexPath(_ indexPath:)` method to check whether given IndexPath is valid within UITableView. [#441](https://github.com/SwifterSwift/SwifterSwift/pull/441) by [setoelkahfi](https://github.com/setoelkahfi).
-> ### Changed
+**Optional**:
+  - Added `isNilOrEmpty` property to check whether an optional is nil or empty collection.
+
+### Changed
 - **UITableViewExtentions**:
   - `dequeueReusableCell(withClass:for)`, `dequeueReusableCell(withClass)` now return `UITableViewCell` object, `fatalError(...)` if not found. [#439](https://github.com/SwifterSwift/SwifterSwift/pull/439) by [jdisho](https://github.com/jdisho)
   - `dequeueReusableHeaderFooterView(withClass)`now returns `UITableViewHeaderFooterView` object, `fatalError(...)` if not found. [#439](https://github.com/SwifterSwift/SwifterSwift/pull/439) by [jdisho](https://github.com/jdisho)
 - **UICollectionView**:
   - `dequeueReusableCell(withClass:for)` now return `UICollectionViewCell` object, `fatalError(...)` if not found. [#439](https://github.com/SwifterSwift/SwifterSwift/pull/439) by [jdisho](https://github.com/jdisho)
   - `dequeueReusableSupplementaryView(ofKind:withClass:for)`now returns `UICollectionReusableView` object, `fatalError(...)` if not found. [#439](https://github.com/SwifterSwift/SwifterSwift/pull/439) by [jdisho](https://github.com/jdisho)
-> ### Deprecated
-> ### Removed
-> ### Fixed
-> ### Security
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
 
 ---
 
diff --git a/Sources/Extensions/CoreGraphics/CGPointExtensions.swift b/Sources/Extensions/CoreGraphics/CGPointExtensions.swift
index d5784504d..7dceb5c63 100644
--- a/Sources/Extensions/CoreGraphics/CGPointExtensions.swift
+++ b/Sources/Extensions/CoreGraphics/CGPointExtensions.swift
@@ -80,9 +80,8 @@ public extension CGPoint {
 	///   - lhs: self
 	///   - rhs: CGPoint to add.
 	public static func += (lhs: inout CGPoint, rhs: CGPoint) {
-		// swiftlint:disable shorthand_operator
+		// swiftlint:disable next shorthand_operator
 		lhs = lhs + rhs
-		// swiftlint:enable shorthand_operator
 	}
 
 	/// SwifterSwift: Subtract two CGPoints.
@@ -111,9 +110,8 @@ public extension CGPoint {
 	///   - lhs: self
 	///   - rhs: CGPoint to subtract.
 	public static func -= (lhs: inout CGPoint, rhs: CGPoint) {
-		// swiftlint:disable shorthand_operator
+		// swiftlint:disable next shorthand_operator
 		lhs = lhs - rhs
-		// swiftlint:enable shorthand_operator
 	}
 
 	/// SwifterSwift: Multiply a CGPoint with a scalar
@@ -141,9 +139,8 @@ public extension CGPoint {
 	///   - scalar: scalar value.
 	/// - Returns: result of multiplication of the given CGPoint with the scalar.
 	public static func *= (point: inout CGPoint, scalar: CGFloat) {
-		// swiftlint:disable shorthand_operator
+		// swiftlint:disable next shorthand_operator
 		point = point * scalar
-		// swiftlint:enable shorthand_operator
 	}
 
 	/// SwifterSwift: Multiply a CGPoint with a scalar
diff --git a/Sources/Extensions/Shared/ColorExtensions.swift b/Sources/Extensions/Shared/ColorExtensions.swift
index c91c6be66..99b805a9d 100644
--- a/Sources/Extensions/Shared/ColorExtensions.swift
+++ b/Sources/Extensions/Shared/ColorExtensions.swift
@@ -32,7 +32,7 @@ public extension Color {
 		return Color(red: red, green: green, blue: blue)!
 	}
 
-	// swiftlint:disable large_tuple
+	// swiftlint:disable next large_tuple
 	/// SwifterSwift: RGB components for a Color (between 0 and 255).
 	///
 	///		UIColor.red.rgbComponents.red -> 255
@@ -50,9 +50,8 @@ public extension Color {
 		let blue = components[2]
 		return (red: Int(red * 255.0), green: Int(green * 255.0), blue: Int(blue * 255.0))
 	}
-	// swiftlint:enable large_tuple
 
-	// swiftlint:disable large_tuple
+	// swiftlint:disable next large_tuple
 	/// SwifterSwift: RGB components for a Color represented as CGFloat numbers (between 0 and 1)
 	///
 	///		UIColor.red.rgbComponents.red -> 1.0
@@ -70,9 +69,8 @@ public extension Color {
 		let blue = components[2]
 		return (red: red, green: green, blue: blue)
 	}
-	// swiftlint:enable large_tuple
 
-	// swiftlint:disable large_tuple
+	// swiftlint:disable next large_tuple
 	/// SwifterSwift: Get components of hue, saturation, and brightness, and alpha (read-only).
 	public var hsbaComponents: (hue: CGFloat, saturation: CGFloat, brightness: CGFloat, alpha: CGFloat) {
 		var hue: CGFloat = 0.0
@@ -83,7 +81,6 @@ public extension Color {
 		getHue(&hue, saturation: &saturation, brightness: &brightness, alpha: &alpha)
 		return (hue: hue, saturation: saturation, brightness: brightness, alpha: alpha)
 	}
-	// swiftlint:enable large_tuple
 
 	/// SwifterSwift: Hexadecimal value string (read-only).
 	public var hexString: String {
@@ -357,7 +354,7 @@ public extension Color {
 
 }
 
-// swiftlint:disable type_body_length
+// swiftlint:disable next type_body_length
 // MARK: - Social
 public extension Color {
 
@@ -1805,4 +1802,3 @@ public extension Color {
 
 }
 #endif
-// swiftlint:enable type_body_length
diff --git a/Sources/Extensions/SwiftStdlib/Deprecated/SwiftStdlibDeprecated.swift b/Sources/Extensions/SwiftStdlib/Deprecated/SwiftStdlibDeprecated.swift
index dec402bc4..86cd98d8e 100644
--- a/Sources/Extensions/SwiftStdlib/Deprecated/SwiftStdlibDeprecated.swift
+++ b/Sources/Extensions/SwiftStdlib/Deprecated/SwiftStdlibDeprecated.swift
@@ -48,7 +48,7 @@ extension String {
 		return count
 	}
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Sliced string from a start index.
 	///
 	///		"Hello World".slicing(at: 6) -> "World"
@@ -62,7 +62,6 @@ extension String {
 		}
 		return self[safe: i..<count]
 	}
-	// swiftlint:enable identifier_name
 
 	/// SwifterSwift: Sliced string from a start index to an end index.
 	///
diff --git a/Sources/Extensions/SwiftStdlib/DoubleExtensions.swift b/Sources/Extensions/SwiftStdlib/DoubleExtensions.swift
index 02f04c586..7e8b0446d 100755
--- a/Sources/Extensions/SwiftStdlib/DoubleExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/DoubleExtensions.swift
@@ -47,7 +47,7 @@ public func ** (lhs: Double, rhs: Double) -> Double {
 	return pow(lhs, rhs)
 }
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 prefix operator √
 /// SwifterSwift: Square root of double.
 ///
@@ -57,4 +57,3 @@ public prefix func √ (double: Double) -> Double {
 	// http://nshipster.com/swift-operators/
 	return sqrt(double)
 }
-// swiftlint:enable identifier_name
diff --git a/Sources/Extensions/SwiftStdlib/FloatExtensions.swift b/Sources/Extensions/SwiftStdlib/FloatExtensions.swift
index e72f1ee99..6f6ccef0d 100755
--- a/Sources/Extensions/SwiftStdlib/FloatExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/FloatExtensions.swift
@@ -47,7 +47,7 @@ public func ** (lhs: Float, rhs: Float) -> Float {
     return pow(lhs, rhs)
 }
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 prefix operator √
 /// SwifterSwift: Square root of float.
 ///
@@ -57,4 +57,3 @@ public prefix func √ (float: Float) -> Float {
     // http://nshipster.com/swift-operators/
     return sqrt(float)
 }
-// swiftlint:enable identifier_name
diff --git a/Sources/Extensions/SwiftStdlib/FloatingPointExtensions.swift b/Sources/Extensions/SwiftStdlib/FloatingPointExtensions.swift
index 7ce0807bd..833ddc870 100644
--- a/Sources/Extensions/SwiftStdlib/FloatingPointExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/FloatingPointExtensions.swift
@@ -100,7 +100,7 @@ public extension FloatingPoint {
 
 // MARK: - Operators
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 infix operator ±
 /// SwifterSwift: Tuple of plus-minus operation.
 ///
@@ -112,9 +112,8 @@ public func ±<T: FloatingPoint> (lhs: T, rhs: T) -> (T, T) {
 	// http://nshipster.com/swift-operators/
 	return (lhs + rhs, lhs - rhs)
 }
-// swiftlint:enable identifier_name
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 prefix operator ±
 /// SwifterSwift: Tuple of plus-minus operation.
 ///
@@ -124,4 +123,3 @@ public prefix func ±<T: FloatingPoint> (number: T) -> (T, T) {
 	// http://nshipster.com/swift-operators/
 	return 0 ± number
 }
-// swiftlint:enable identifier_name
diff --git a/Sources/Extensions/SwiftStdlib/IntExtensions.swift b/Sources/Extensions/SwiftStdlib/IntExtensions.swift
index b41bcf249..89e44e38c 100755
--- a/Sources/Extensions/SwiftStdlib/IntExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/IntExtensions.swift
@@ -165,12 +165,11 @@ public extension Int {
 		return romanValue
 	}
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Rounds to the closest multiple of n
 	public func roundToNearest(_ n: Int) -> Int {
 		return n == 0 ? self : Int(round(Double(self) / Double(n))) * n
 	}
-	// swiftlint:enable identifier_name
 
 }
 
@@ -210,7 +209,7 @@ public func ** (lhs: Int, rhs: Int) -> Double {
 	return pow(Double(lhs), Double(rhs))
 }
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 prefix operator √
 /// SwifterSwift: Square root of integer.
 ///
@@ -220,9 +219,8 @@ public prefix func √ (int: Int) -> Double {
 	// http://nshipster.com/swift-operators/
 	return sqrt(Double(int))
 }
-// swiftlint:enable identifier_name
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 infix operator ±
 /// SwifterSwift: Tuple of plus-minus operation.
 ///
@@ -234,9 +232,8 @@ public func ± (lhs: Int, rhs: Int) -> (Int, Int) {
 	// http://nshipster.com/swift-operators/
 	return (lhs + rhs, lhs - rhs)
 }
-// swiftlint:enable identifier_name
 
-// swiftlint:disable identifier_name
+// swiftlint:disable next identifier_name
 prefix operator ±
 /// SwifterSwift: Tuple of plus-minus operation.
 ///
@@ -246,4 +243,3 @@ public prefix func ± (int: Int) -> (Int, Int) {
 	// http://nshipster.com/swift-operators/
 	return 0 ± int
 }
-// swiftlint:enable identifier_name
diff --git a/Sources/Extensions/SwiftStdlib/OptionalExtensions.swift b/Sources/Extensions/SwiftStdlib/OptionalExtensions.swift
index f396229b9..3ed386197 100644
--- a/Sources/Extensions/SwiftStdlib/OptionalExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/OptionalExtensions.swift
@@ -9,22 +9,22 @@
 // MARK: - Methods
 public extension Optional {
 
-	/// SwifterSwift: Get self of default value (if self is nil).
-	///
-	///		let foo: String? = nil
-	///		print(foo.unwrapped(or: "bar")) -> "bar"
-	///
-	///		let bar: String? = "bar"
-	///		print(bar.unwrapped(or: "foo")) -> "bar"
-	///
-	/// - Parameter defaultValue: default value to return if self is nil.
-	/// - Returns: self if not nil or default value if nil.
-	public func unwrapped(or defaultValue: Wrapped) -> Wrapped {
-		// http://www.russbishop.net/improving-optionals
-		return self ?? defaultValue
-	}
+    /// SwifterSwift: Get self of default value (if self is nil).
+    ///
+    ///		let foo: String? = nil
+    ///		print(foo.unwrapped(or: "bar")) -> "bar"
+    ///
+    ///		let bar: String? = "bar"
+    ///		print(bar.unwrapped(or: "foo")) -> "bar"
+    ///
+    /// - Parameter defaultValue: default value to return if self is nil.
+    /// - Returns: self if not nil or default value if nil.
+    public func unwrapped(or defaultValue: Wrapped) -> Wrapped {
+        // http://www.russbishop.net/improving-optionals
+        return self ?? defaultValue
+    }
 
-	/// SwifterSwift: Gets the wrapped value of an optional. If the optional is `nil`, throw a custom error.
+    /// SwifterSwift: Gets the wrapped value of an optional. If the optional is `nil`, throw a custom error.
     ///
     ///        let foo: String? = nil
     ///        try print(foo.unwrapped(or: MyError.notFound)) -> error: MyError.notFound
@@ -40,39 +40,50 @@ public extension Optional {
         return wrapped
     }
 
-	/// SwifterSwift: Runs a block to Wrapped if not nil
-	///
-	///		let foo: String? = nil
-	///		foo.run { unwrappedFoo in
-	///			// block will never run sice foo is nill
-	///			print(unwrappedFoo)
-	///		}
-	///
-	///		let bar: String? = "bar"
-	///		bar.run { unwrappedBar in
-	///			// block will run sice bar is not nill
-	///			print(unwrappedBar) -> "bar"
-	///		}
-	///
-	/// - Parameter block: a block to run if self is not nil.
-	public func run(_ block: (Wrapped) -> Void) {
-		// http://www.russbishop.net/improving-optionals
-		_ = self.map(block)
-	}
+    /// SwifterSwift: Runs a block to Wrapped if not nil
+    ///
+    ///		let foo: String? = nil
+    ///		foo.run { unwrappedFoo in
+    ///			// block will never run sice foo is nill
+    ///			print(unwrappedFoo)
+    ///		}
+    ///
+    ///		let bar: String? = "bar"
+    ///		bar.run { unwrappedBar in
+    ///			// block will run sice bar is not nill
+    ///			print(unwrappedBar) -> "bar"
+    ///		}
+    ///
+    /// - Parameter block: a block to run if self is not nil.
+    public func run(_ block: (Wrapped) -> Void) {
+        // http://www.russbishop.net/improving-optionals
+        _ = self.map(block)
+    }
+
+    /// SwifterSwift: Assign an optional value to a variable only if the value is not nil.
+    ///
+    ///     let someParameter: String? = nil
+    ///     let parameters = [String:Any]() //Some parameters to be attached to a GET request
+    ///     parameters[someKey] ??= someParameter //It won't be added to the parameters dict
+    ///
+    /// - Parameters:
+    ///   - lhs: Any?
+    ///   - rhs: Any?
+    public static func ??= (lhs: inout Optional, rhs: Optional) {
+        guard let rhs = rhs else { return }
+        lhs = rhs
+    }
+
+}
+
+// MARK: - Methods (Collection)
+public extension Optional where Wrapped: Collection {
 
-	/// SwifterSwift: Assign an optional value to a variable only if the value is not nil.
-	///
-	///     let someParameter: String? = nil
-	///     let parameters = [String:Any]() //Some parameters to be attached to a GET request
-	///     parameters[someKey] ??= someParameter //It won't be added to the parameters dict
-	///
-	/// - Parameters:
-	///   - lhs: Any?
-	///   - rhs: Any?
-	public static func ??= (lhs: inout Optional, rhs: Optional) {
-		guard let rhs = rhs else { return }
-		lhs = rhs
-	}
+    /// Check if optional is nil or empty collection.
+    public var isNilOrEmpty: Bool {
+        guard let collection = self else { return true }
+        return collection.isEmpty
+    }
 
 }
 
diff --git a/Sources/Extensions/SwiftStdlib/SignedIntegerExtensions.swift b/Sources/Extensions/SwiftStdlib/SignedIntegerExtensions.swift
index cfa760fb1..eff9bfe8d 100644
--- a/Sources/Extensions/SwiftStdlib/SignedIntegerExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/SignedIntegerExtensions.swift
@@ -59,7 +59,7 @@ public extension SignedInteger {
 // MARK: - Methods
 public extension SignedInteger {
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Greatest common divisor of integer value and n.
 	///
 	/// - Parameter n: integer value to find gcd with.
@@ -67,9 +67,8 @@ public extension SignedInteger {
 	public func gcd(of n: Self) -> Self {
 		return n == 0 ? self : n.gcd(of: self % n)
 	}
-	// swiftlint:enable identifier_name
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Least common multiple of integer and n.
 	///
 	/// - Parameter n: integer value to find lcm with.
@@ -77,7 +76,6 @@ public extension SignedInteger {
 	public func lcm(of n: Self) -> Self {
 		return (self * n).abs / gcd(of: n)
 	}
-	// swiftlint:enable identifier_name
 
     #if canImport(Foundation)
     @available(iOS 9.0, macOS 10.11, *)
diff --git a/Sources/Extensions/SwiftStdlib/SignedNumericExtensions.swift b/Sources/Extensions/SwiftStdlib/SignedNumericExtensions.swift
index b3b3e6d7a..a9b1c1e6b 100644
--- a/Sources/Extensions/SwiftStdlib/SignedNumericExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/SignedNumericExtensions.swift
@@ -19,9 +19,8 @@ public extension SignedNumeric {
 		let formatter = NumberFormatter()
 		formatter.numberStyle = .currency
 		formatter.locale = Locale.current
-        // swiftlint:disable force_cast
+        // swiftlint:disable next force_cast
 		return formatter.string(from: self as! NSNumber)
-        // swiftlint:enable force_cast
 	}
 
 }
diff --git a/Sources/Extensions/SwiftStdlib/StringExtensions.swift b/Sources/Extensions/SwiftStdlib/StringExtensions.swift
index 520ab8111..787d351d1 100755
--- a/Sources/Extensions/SwiftStdlib/StringExtensions.swift
+++ b/Sources/Extensions/SwiftStdlib/StringExtensions.swift
@@ -563,7 +563,7 @@ public extension String {
 	}
 	#endif
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Safely subscript string with index.
 	///
 	///		"Hello World!"[3] -> "l"
@@ -574,7 +574,6 @@ public extension String {
 		guard i >= 0 && i < count else { return nil }
 		return self[index(startIndex, offsetBy: i)]
 	}
-	// swiftlint:enable identifier_name
 
 	/// SwifterSwift: Safely subscript string within a half-open range.
 	///
@@ -736,7 +735,7 @@ public extension String {
 		self = String(chars)
 	}
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Sliced string from a start index with length.
 	///
 	///        "Hello World".slicing(from: 6, length: 5) -> "World"
@@ -753,9 +752,8 @@ public extension String {
 		guard length > 0 else { return "" }
 		return self[safe: i..<i.advanced(by: length)]
 	}
-	// swiftlint:enable identifier_name
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Slice given string from a start index with length (if applicable).
 	///
 	///		var str = "Hello World"
@@ -770,7 +768,6 @@ public extension String {
 			self = String(str)
 		}
 	}
-	// swiftlint:enable identifier_name
 
 	/// SwifterSwift: Slice given string from a start index to an end index (if applicable).
 	///
@@ -788,7 +785,7 @@ public extension String {
 		}
 	}
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: Slice given string from a start index (if applicable).
 	///
 	///		var str = "Hello World"
@@ -802,7 +799,6 @@ public extension String {
 			self = str
 		}
 	}
-	// swiftlint:enable identifier_name
 
 	/// SwifterSwift: Check if string starts with substring.
 	///
diff --git a/Sources/Extensions/UIKit/UITextViewExtensions.swift b/Sources/Extensions/UIKit/UITextViewExtensions.swift
index 9e53dadee..8a25b52d7 100644
--- a/Sources/Extensions/UIKit/UITextViewExtensions.swift
+++ b/Sources/Extensions/UIKit/UITextViewExtensions.swift
@@ -21,12 +21,14 @@ public extension UITextView {
 
 	/// SwifterSwift: Scroll to the bottom of text view
 	public func scrollToBottom() {
+        // swiftlint:disable next legacy_constructor
 		let range = NSMakeRange((text as NSString).length - 1, 1)
-		scrollRangeToVisible(range)
+        scrollRangeToVisible(range)
 	}
 
 	/// SwifterSwift: Scroll to the top of text view
 	public func scrollToTop() {
+        // swiftlint:disable next legacy_constructor
 		let range = NSMakeRange(0, 1)
 		scrollRangeToVisible(range)
 	}
diff --git a/Sources/Extensions/UIKit/UIViewExtensions.swift b/Sources/Extensions/UIKit/UIViewExtensions.swift
index d40d5ad6e..fa78e5949 100755
--- a/Sources/Extensions/UIKit/UIViewExtensions.swift
+++ b/Sources/Extensions/UIKit/UIViewExtensions.swift
@@ -197,7 +197,7 @@ public extension UIView {
 		}
 	}
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: x origin of view.
 	public var x: CGFloat {
 		get {
@@ -207,9 +207,8 @@ public extension UIView {
 			frame.origin.x = newValue
 		}
 	}
-	// swiftlint:enable identifier_name
 
-	// swiftlint:disable identifier_name
+	// swiftlint:disable next identifier_name
 	/// SwifterSwift: y origin of view.
 	public var y: CGFloat {
 		get {
@@ -219,7 +218,6 @@ public extension UIView {
 			frame.origin.y = newValue
 		}
 	}
-	// swiftlint:enable identifier_name
 
 }
 
diff --git a/Tests/FoundationTests/DateExtensionsTests.swift b/Tests/FoundationTests/DateExtensionsTests.swift
index 8c4dff814..842e41024 100644
--- a/Tests/FoundationTests/DateExtensionsTests.swift
+++ b/Tests/FoundationTests/DateExtensionsTests.swift
@@ -8,7 +8,7 @@
 import XCTest
 @testable import SwifterSwift
 
-// swiftlint:disable type_body_length
+// swiftlint:disable next type_body_length
 final class DateExtensionsTests: XCTestCase {
 
 	override func setUp() {
@@ -16,7 +16,7 @@ final class DateExtensionsTests: XCTestCase {
 		NSTimeZone.default = TimeZone(abbreviation: "UTC")!
 	}
 
-	// swiftlint:disable cyclomatic_complexity
+	// swiftlint:disable next cyclomatic_complexity
 	func testCalendar() {
 		switch Calendar.current.identifier {
 		case .buddhist:
@@ -53,7 +53,6 @@ final class DateExtensionsTests: XCTestCase {
 			XCTAssertEqual(Date().calendar.identifier, Calendar(identifier: .republicOfChina).identifier)
 		}
 	}
-	// swiftlint:enable cyclomatic_complexity
 
 	func testEra() {
 		let date = Date(timeIntervalSince1970: 0)
@@ -511,7 +510,7 @@ final class DateExtensionsTests: XCTestCase {
 		XCTAssertEqual(date8.adding(.year, value: -4), date)
 	}
 
-	// swiftlint:disable function_body_length
+	// swiftlint:disable next function_body_length
 	func testAdd() {
 		var date = Date(timeIntervalSince1970: 0)
 
@@ -570,7 +569,6 @@ final class DateExtensionsTests: XCTestCase {
 		date.add(.year, value: 1)
 		XCTAssertEqual(date.year, 2018)
 	}
-	// swiftlint:enable function_body_length
 
 	func testChanging() {
 		let date = Date(timeIntervalSince1970: 0)
@@ -943,4 +941,3 @@ final class DateExtensionsTests: XCTestCase {
 	}
 
 }
-// swiftlint:enable type_body_length
diff --git a/Tests/SharedTests/ColorExtensionsTests.swift b/Tests/SharedTests/ColorExtensionsTests.swift
index bbfaa3104..91835ae0a 100644
--- a/Tests/SharedTests/ColorExtensionsTests.swift
+++ b/Tests/SharedTests/ColorExtensionsTests.swift
@@ -20,7 +20,7 @@ public typealias Color = UIColor
 import CoreImage
 #endif
 
-// swiftlint:disable type_body_length
+// swiftlint:disable next type_body_length
 final class ColorExtensionsTests: XCTestCase {
 
 	// MARK: - Test properties
@@ -441,4 +441,3 @@ final class ColorExtensionsTests: XCTestCase {
 	}
 
 }
-// swiftlint:enable type_body_length
diff --git a/Tests/SwiftStdlibTests/ArrayExtensionsTests.swift b/Tests/SwiftStdlibTests/ArrayExtensionsTests.swift
index 04f2793fe..3a6667111 100644
--- a/Tests/SwiftStdlibTests/ArrayExtensionsTests.swift
+++ b/Tests/SwiftStdlibTests/ArrayExtensionsTests.swift
@@ -18,7 +18,7 @@ private struct Person: Equatable {
 
 }
 
-// swiftlint:disable type_body_length
+// swiftlint:disable next type_body_length
 final class ArrayExtensionsTests: XCTestCase {
 
     func testSum() {
@@ -408,4 +408,3 @@ final class ArrayExtensionsTests: XCTestCase {
     }
 
 }
-// swiftlint:enable type_body_length
diff --git a/Tests/SwiftStdlibTests/OptionalExtensionsTests.swift b/Tests/SwiftStdlibTests/OptionalExtensionsTests.swift
index cad9ddc4f..c783148f8 100644
--- a/Tests/SwiftStdlibTests/OptionalExtensionsTests.swift
+++ b/Tests/SwiftStdlibTests/OptionalExtensionsTests.swift
@@ -63,4 +63,28 @@ final class OptionalExtensionsTests: XCTestCase {
 		XCTAssert(parameters[key2] == parameter2)
 	}
 
+    func testIsNilOrEmpty() {
+        let nilArray: [String]? = nil
+        XCTAssertTrue(nilArray.isNilOrEmpty)
+
+        let emptyArray: [String]? = []
+        XCTAssertTrue(emptyArray.isNilOrEmpty)
+
+        let intArray: [Int]? = [1]
+        XCTAssertFalse(intArray.isNilOrEmpty)
+
+        let optionalArray: [Int]? = [1]
+        XCTAssertFalse(optionalArray.isNilOrEmpty)
+
+        let nilString: String? = nil
+        XCTAssert(nilString.isNilOrEmpty)
+
+        let emptyString: String? = ""
+        XCTAssert(emptyString.isNilOrEmpty)
+
+        let string: String? = "hello World!"
+        XCTAssertFalse(string.isNilOrEmpty)
+
+    }
+
 }
diff --git a/Tests/SwiftStdlibTests/StringExtensionsTests.swift b/Tests/SwiftStdlibTests/StringExtensionsTests.swift
index 79f3b8865..06b70505f 100644
--- a/Tests/SwiftStdlibTests/StringExtensionsTests.swift
+++ b/Tests/SwiftStdlibTests/StringExtensionsTests.swift
@@ -9,7 +9,7 @@
 import XCTest
 @testable import SwifterSwift
 
-// swiftlint:disable type_body_length
+// swiftlint:disable next type_body_length
 final class StringExtensionsTests: XCTestCase {
 
     var helloWorld = "Hello World!"
@@ -583,18 +583,19 @@ final class StringExtensionsTests: XCTestCase {
     #if !os(tvOS) && !os(watchOS)
     func testBold() {
         let boldString = "hello".bold
+        // swiftlint:disable next legacy_constructor
         let attrs = boldString.attributes(at: 0, longestEffectiveRange: nil, in: NSMakeRange(0, boldString.length))
         XCTAssertNotNil(attrs[NSAttributedStringKey.font])
 
         #if os(macOS)
         guard let font = attrs[.font] as? NSFont else {
-            XCTFail()
+            XCTFail("Unable to find font in testBold")
             return
         }
         XCTAssertEqual(font, NSFont.boldSystemFont(ofSize: NSFont.systemFontSize))
         #elseif os(iOS)
         guard let font = attrs[NSAttributedStringKey.font] as? UIFont else {
-            XCTFail()
+            XCTFail("Unable to find font in testBold")
             return
         }
         XCTAssertEqual(font, UIFont.boldSystemFont(ofSize: UIFont.systemFontSize))
@@ -604,10 +605,12 @@ final class StringExtensionsTests: XCTestCase {
 
     func testUnderline() {
         let underlinedString = "hello".underline
+        // swiftlint:disable legacy_constructor
         let attrs = underlinedString.attributes(at: 0, longestEffectiveRange: nil, in: NSMakeRange(0, underlinedString.length))
+        // swiftlint:enable legacy_constructor
         XCTAssertNotNil(attrs[NSAttributedStringKey.underlineStyle])
         guard let style = attrs[NSAttributedStringKey.underlineStyle] as? Int else {
-            XCTFail()
+            XCTFail("Unable to find style in testUnderline")
             return
         }
         XCTAssertEqual(style, NSUnderlineStyle.styleSingle.rawValue)
@@ -615,10 +618,11 @@ final class StringExtensionsTests: XCTestCase {
 
     func testStrikethrough() {
         let strikedthroughString = "hello".strikethrough
+        // swiftlint:disable next legacy_constructor
         let attrs = strikedthroughString.attributes(at: 0, longestEffectiveRange: nil, in: NSMakeRange(0, strikedthroughString.length))
         XCTAssertNotNil(attrs[NSAttributedStringKey.strikethroughStyle])
         guard let style = attrs[NSAttributedStringKey.strikethroughStyle] as? NSNumber else {
-            XCTFail()
+            XCTFail("Unable to find style in testStrikethrough")
             return
         }
         XCTAssertEqual(style, NSNumber(value: NSUnderlineStyle.styleSingle.rawValue as Int))
@@ -627,10 +631,11 @@ final class StringExtensionsTests: XCTestCase {
     #if os(iOS)
     func testItalic() {
         let italicString = "hello".italic
+        // swiftlint:disable next legacy_constructor
         let attrs = italicString.attributes(at: 0, longestEffectiveRange: nil, in: NSMakeRange(0, italicString.length))
         XCTAssertNotNil(attrs[NSAttributedStringKey.font])
         guard let font = attrs[NSAttributedStringKey.font] as? UIFont else {
-            XCTFail()
+            XCTFail("Unable to find font in testItalic")
             return
         }
         XCTAssertEqual(font, UIFont.italicSystemFont(ofSize: UIFont.systemFontSize))
@@ -639,18 +644,19 @@ final class StringExtensionsTests: XCTestCase {
 
     func testColored() {
         let coloredString = "hello".colored(with: .orange)
+        // swiftlint:disable next legacy_constructor
         let attrs = coloredString.attributes(at: 0, longestEffectiveRange: nil, in: NSMakeRange(0, coloredString.length))
         XCTAssertNotNil(attrs[NSAttributedStringKey.foregroundColor])
 
         #if os(macOS)
         guard let color = attrs[.foregroundColor] as? NSColor else {
-            XCTFail()
+            XCTFail("Unable to find color in testColored")
             return
         }
         XCTAssertEqual(color, NSColor.orange)
         #else
         guard let color = attrs[NSAttributedStringKey.foregroundColor] as? UIColor else {
-            XCTFail()
+            XCTFail("Unable to find color in testColored")
             return
         }
         XCTAssertEqual(color, UIColor.orange)
@@ -729,4 +735,3 @@ final class StringExtensionsTests: XCTestCase {
     }
 
 }
-// swiftlint:enable type_body_length