diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27bc5b7..7f68b66 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,177 +1,189 @@
 # Change Log
 All notable changes to this project will be documented in this file
 
-## Next version
+### Next version
 
-#### New
+#### 🙌 New
 
-#### Improvements
+#### 🔬Improvements
+  
+#### 🩹 Bug fixes
+* [**259**](https://github.com/Juanpe/SkeletonView/issues/259): Prevent isSkeletonActive to be called when isSkeletonable is false
+
+### 📦 [1.8.6](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.6)
+
+#### 🔬Improvements
 * [**242**](https://github.com/Juanpe/SkeletonView/pull/242): Offscreen table view layout issue fixed - [@Cacodemon](https://github.com/Cacodemon)
 * [**261**](https://github.com/Juanpe/SkeletonView/pull/261): Fixes removing skeleton layers from table header footer sections - [@darkside999](https://github.com/darkside999)
-
-#### Bug fixes
+* [**263**](https://github.com/Juanpe/SkeletonView/pull/263): Feature/set cross dissolve transitions as default - [@Juanpe](https://github.com/Juanpe)
+* [**264**](https://github.com/Juanpe/SkeletonView/pull/264): not replace original datasource is running XCTests - [@Juanpe](https://github.com/Juanpe)
+* [**265**](https://github.com/Juanpe/SkeletonView/pull/265): call original traitCollectionDidChange method - [@Juanpe](https://github.com/Juanpe)
+  
+#### 🩹 Bug fixes
+* [**260**](https://github.com/Juanpe/SkeletonView/issues/260): Don't hide skeleton layers on TableViewHeaderFooterView
+* [**257**](https://github.com/Juanpe/SkeletonView/issues/257): Unit test problem when using SkeletonView
 
 
-## [1.8.3](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.3)
+### 📦 [1.8.3](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.3)
 
 - Support for iOS 13 dark mode. (thanks @Wilsonator5000)
 
-## [1.8.2](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.2)
+### 📦 [1.8.2](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.2)
 
-### New
+#### 🙌 New
 - Add ability to customize line spacing per label. (thanks @gshahbazian) 
 
-## [LayoutSkeleton (1.8.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.1)
+### 📦 [LayoutSkeleton (1.8.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8.1)
 
-### Improvements
+#### 🔬Improvements
 - Fix completion call in .none transition style while hide skeletons. (thanks @aadudyrev)
 
-### New
+#### 🙌 New
 - Swizzle `layoutSubviews` method. 
 
-### Improvements
+#### 🔬Improvements
 - Fix completion call in .none transition style while hiding skeletons. (thanks @aadudyrev)
 - Swift format.
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Update layout subviews when the original method is called.
    - Issues: [#88, #149]
 
-## [Transitions (1.8)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8)
+### 📦 [Transitions (1.8)](https://github.com/Juanpe/SkeletonView/releases/tag/1.8)
 
-### New
+#### 🙌 New
 
 - Adding swift news to mentioned section (thanks @osterbergmarcus).
 - Create `SkeletonTransitionStyle`. Now, you can animate transition when you show or hide skeletons. (thanks @pontusjacobsson)
 
-### Improvements
+#### 🔬Improvements
 - Refactor some methods.
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issues.
  [#175](https://github.com/Juanpe/SkeletonView/issues/175) Swift Package Manager version format
 
-## [Layout update (1.7)](https://github.com/Juanpe/SkeletonView/releases/tag/1.7)
+### 📦 [Layout update (1.7)](https://github.com/Juanpe/SkeletonView/releases/tag/1.7)
 
-### New
+#### 🙌 New
 
 - Allow updating skeleton layout to recalculate skeleton bounds: `layoutSkeletonIfNeeded`. See the examples to know how to use it. (thanks @eduardbosch)
 
-### Improvements
+#### 🔬Improvements
 
 - Allow updating skeleton layers without recreating them: `updateSkeleton`, `updateGradientSkeleton`, `updateAnimatedSkeleton`, `updateAnimatedGradientSkeleton`. (thanks @eduardbosch)
 
-## [Debug (1.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.4)
+### 📦 [Debug (1.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.4)
 
-### New
+#### 🙌 New
 
 - Create `skeletonDescription` print a skeleton representation of the view.
 - Create `SKELETON_DEBUG` environment variable, in order to print the view hierarchy when the skeleton appears.
 
-### Improvements
+#### 🔬Improvements
 - Add two new methods to `SkeletonFlowDelegate` protocol. Now you can know when the skeleton did show and when it did hide.
 - `Recursive` protocol
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#86](https://github.com/Juanpe/SkeletonView/issues/86) (thanks @reececomo)
 
-## [Custom defaults (1.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.3)
+### 📦 [Custom defaults (1.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.3)
 
-### New
+#### 🙌 New
 
 - Default values customizables. Now you can set the default values of Skeleton appearance.(thanks @reececomo)
   - issues: [[#50](https://github.com/Juanpe/SkeletonView/issues/50), [#83](https://github.com/Juanpe/SkeletonView/issues/83)]
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#41](https://github.com/Juanpe/SkeletonView/issues/41). Now, Skeleton works if UICollectionView cell's Nib is registered in code. (thanks @kjoneandrei)
 
-## [Typo (1.2.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.3)
+### 📦 [Typo (1.2.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.3)
 
-### Fixes
+####  Fixes
 
 - Fix typo in `SkeletonTableViewDataSource` protocol
 
-### Improvements
+#### 🔬Improvements
 
 - Now it takes in account the `UIStackView` to calculate the `SkeletonLayer` bounds (thanks @giantramen)
 
-## [New face (1.2.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.2)
+### 📦 [New face (1.2.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.2)
 
-### New
+#### 🙌 New
 
 - Rebranding
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#23](https://github.com/Juanpe/SkeletonView/issues/23). Problem with UIStackView. (thanks @giantramen)
 
-## [State (1.2.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.1)
+### 📦 [State (1.2.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2.1)
 
-### New
+#### 🙌 New
 
 - You can set the corner radius multiline elements (thanks @B4V4-G)
 - Save view state when skeleton appears and recovery when it is hidden (@juanpe)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#51](https://github.com/Juanpe/SkeletonView/issues/51). Support inspectable properties when using Carthage. (thanks @eduardbosch)
 
-## [On TV (1.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2)
+### 📦 [On TV (1.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.2)
 
-### New
+#### 🙌 New
 - Now ```SkeletonView``` is **tvOS** compatible! 🎉.  (thanks @mihai8804858)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#46](https://github.com/Juanpe/SkeletonView/issues/46). It crashes the application when tap on it, didSelect called and crash.
 
 
-## [Hotfix (1.1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1.1)
+### 📦 [Hotfix (1.1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1.1)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Now yes, solved issue [#39](https://github.com/Juanpe/SkeletonView/issues/39)
 
-## [Needed (1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1)
+### 📦 [Needed (1.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.1)
 
-### New
+#### 🙌 New
 - Now ```SkeletonView```supports **UICollectionViews**! 🎉.  (thanks @Renatdz)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#39](https://github.com/Juanpe/SkeletonView/issues/39). Gradient animation did not work when app becomes active.
 
 
-## [Resizable (1.0.5)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.5)
+### 📦 [Resizable (1.0.5)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.5)
 
-### New
+#### 🙌 New
 - Now you can use table views with resizable cells.
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issues.
  [#17](https://github.com/Juanpe/SkeletonView/issues/17),
  [#30](https://github.com/Juanpe/SkeletonView/issues/30),
  [#34](https://github.com/Juanpe/SkeletonView/issues/34).
 
-## [Filled or not (1.0.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.4)
+### 📦 [Filled or not (1.0.4)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.4)
 
-### New
+#### 🙌 New
 - You can set the filling percent of the last line in multiline elements (thanks @jontelang!)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - Solved issue [#14](https://github.com/Juanpe/SkeletonView/issues/14). You could edit text views with skeleton active.
 
-## [In all directions (1.0.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.3)
+### 📦 [In all directions (1.0.3)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.3)
 
-### New
+#### 🙌 New
 - Create ```SkeletonAnimationBuilder```, to facilitate the creation of layer animations.
 ```GradientDirection``` enum.
 
-## [Retro (1.0.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
+### 📦 [Retro (1.0.2)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
 
-### New
+#### 🙌 New
 - Change some private keywords, to be Swift 3 compatible
 
-## [Early bird bug (1.0.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
+### 📦 [Early bird bug (1.0.1)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0.2)
 
-### Bug fixes
+#### 🩹 Bug fixes
 - It was not removing the skeleton layer
 
-## [Starter (1.0)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0)
+### 📦 [Starter (1.0)](https://github.com/Juanpe/SkeletonView/releases/tag/1.0)
 
 - First release
diff --git a/Example/CollectionView/Main.storyboard b/Example/CollectionView/Main.storyboard
index 8ffdd37..585aa75 100644
--- a/Example/CollectionView/Main.storyboard
+++ b/Example/CollectionView/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="irH-dz-xqL">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="irH-dz-xqL">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -19,7 +17,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eHI-ka-8vS">
-                                <rect key="frame" x="0.0" y="20" width="375" height="243"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="243"/>
                                 <subviews>
                                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="obr-b6-dib">
                                         <rect key="frame" x="45" y="142" width="287" height="78"/>
@@ -66,7 +64,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="HKL-L0-T2w">
-                                <rect key="frame" x="0.0" y="263" width="375" height="244"/>
+                                <rect key="frame" x="0.0" y="243" width="375" height="264"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="mGU-kn-rfE">
                                     <size key="itemSize" width="50" height="50"/>
@@ -83,7 +81,7 @@
                                 <rect key="frame" x="0.0" y="507" width="375" height="160"/>
                                 <subviews>
                                     <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="fMR-vj-7de">
-                                        <rect key="frame" x="20" y="22.5" width="135" height="29"/>
+                                        <rect key="frame" x="20" y="21" width="145" height="32"/>
                                         <segments>
                                             <segment title="Solid"/>
                                             <segment title="Gradient"/>
@@ -135,14 +133,14 @@
                                             <action selector="showOrHideSkeleton:" destination="irH-dz-xqL" eventType="touchUpInside" id="lHc-k2-OgV"/>
                                         </connections>
                                     </button>
-                                    <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="5" stepValue="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="3mz-9M-e7Q">
-                                        <rect key="frame" x="263" y="126" width="94" height="29"/>
+                                    <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.25" maximumValue="5" stepValue="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="3mz-9M-e7Q">
+                                        <rect key="frame" x="263" y="123" width="94" height="32"/>
                                         <connections>
                                             <action selector="transitionDurationStepperAction:" destination="irH-dz-xqL" eventType="valueChanged" id="Ll0-Pr-d0V"/>
                                         </connections>
                                     </stepper>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fade Duration: 0 sec" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gN-Jz-44y">
-                                        <rect key="frame" x="113.5" y="131.5" width="141.5" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fade Duration: 0.25 sec" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gN-Jz-44y">
+                                        <rect key="frame" x="92.5" y="130" width="162.5" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
diff --git a/Example/CollectionView/ViewController.swift b/Example/CollectionView/ViewController.swift
index b1a2f25..7ec7a8c 100644
--- a/Example/CollectionView/ViewController.swift
+++ b/Example/CollectionView/ViewController.swift
@@ -45,6 +45,7 @@ class ViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        transitionDurationStepper.value = 0.25
         collectionView.prepareSkeleton(completion: { done in
             self.view.showAnimatedSkeleton()
         })
diff --git a/Example/TableView/Base.lproj/Main.storyboard b/Example/TableView/Base.lproj/Main.storyboard
index 5bf44e9..14f46e3 100644
--- a/Example/TableView/Base.lproj/Main.storyboard
+++ b/Example/TableView/Base.lproj/Main.storyboard
@@ -190,13 +190,13 @@
                                             <action selector="showOrHideSkeleton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Ma1-WX-Dzy"/>
                                         </connections>
                                     </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fade Duration: 0 sec" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mrw-PM-jJJ">
-                                        <rect key="frame" x="113.66666666666667" y="130" width="141.33333333333331" height="18"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fade Duration: 0.25 sec" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mrw-PM-jJJ">
+                                        <rect key="frame" x="92.333333333333329" y="130" width="162.66666666666669" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
-                                    <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="5" stepValue="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="l4N-LL-ZrJ">
+                                    <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.25" maximumValue="5" stepValue="0.25" translatesAutoresizingMaskIntoConstraints="NO" id="l4N-LL-ZrJ">
                                         <rect key="frame" x="263" y="123" width="94" height="32"/>
                                         <connections>
                                             <action selector="transitionDurationStepperAction:" destination="BYZ-38-t0r" eventType="valueChanged" id="jPN-df-fNs"/>
diff --git a/Example/TableView/ViewController.swift b/Example/TableView/ViewController.swift
index 66da4d4..c4aefea 100644
--- a/Example/TableView/ViewController.swift
+++ b/Example/TableView/ViewController.swift
@@ -51,6 +51,7 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         tableview.isSkeletonable = true
+        transitionDurationStepper.value = 0.25
         view.showAnimatedSkeleton()
     }
     
diff --git a/README.md b/README.md
index 4c2ecde..d61f6f7 100755
--- a/README.md
+++ b/README.md
@@ -428,6 +428,8 @@ view.hideSkeleton(transition: .crossDissolve(0.25))     //Hide skeleton cross di
 
 ```
 
+The default value is  `crossDissolve(0.25)`
+
 **Preview**
 
 <table>
diff --git a/SkeletonView.podspec b/SkeletonView.podspec
index f4c28c8..6d5ffaf 100644
--- a/SkeletonView.podspec
+++ b/SkeletonView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SkeletonView"
-  s.version      = "1.8.5"
+  s.version      = "1.8.6"
   s.summary      = "An elegant way to show users that something is happening and also prepare them to which contents he is waiting"
   s.description  = <<-DESC
   Today almost all apps have async processes, as API requests, long runing processes, etc. And while the processes are working, usually developers place a loading view to show users that something is going on.
diff --git a/SkeletonView.xcodeproj/project.pbxproj b/SkeletonView.xcodeproj/project.pbxproj
index 929045e..f3a44ac 100644
--- a/SkeletonView.xcodeproj/project.pbxproj
+++ b/SkeletonView.xcodeproj/project.pbxproj
@@ -30,6 +30,8 @@
 		17DD0E1F207FB32100C56334 /* RecursiveProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5307E311FB0F42F00EE67C5 /* RecursiveProtocol.swift */; };
 		1E6C67A2230E76CC0019D87B /* SkeletonTransitionStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4CE587C22EEE65200333067 /* SkeletonTransitionStyle.swift */; };
 		1E6C67A3230E76CE0019D87B /* UIView+Transitions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E4CE587B22EEE63100333067 /* UIView+Transitions.swift */; };
+		1EE42E1F23FF25CC00BF665A /* ProcessInfo+XCTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE42E1E23FF25CC00BF665A /* ProcessInfo+XCTest.swift */; };
+		1EE42E2023FF25CC00BF665A /* ProcessInfo+XCTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1EE42E1E23FF25CC00BF665A /* ProcessInfo+XCTest.swift */; };
 		42ABD063210B548200BEEFF4 /* SkeletonView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SkeletonView.framework */; };
 		42ABD069210B548200BEEFF4 /* SkeletonView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SkeletonView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		42ABD078210B54E200BEEFF4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42ABD070210B54E100BEEFF4 /* AppDelegate.swift */; };
@@ -156,6 +158,7 @@
 		17DD0E00207FB27400C56334 /* SkeletonView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SkeletonView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		17DD0E1A207FB2C200C56334 /* SkeletonView-tvOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SkeletonView-tvOS.plist"; sourceTree = "<group>"; };
 		17DD0E1B207FB2C200C56334 /* SkeletonView-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SkeletonView-iOS.plist"; sourceTree = "<group>"; };
+		1EE42E1E23FF25CC00BF665A /* ProcessInfo+XCTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProcessInfo+XCTest.swift"; sourceTree = "<group>"; };
 		42ABD06D210B548200BEEFF4 /* SkeletonViewExampleUICollectionView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SkeletonViewExampleUICollectionView.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		42ABD070210B54E100BEEFF4 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		42ABD071210B54E100BEEFF4 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
@@ -438,6 +441,7 @@
 				F5804771230ECD0000066D02 /* UIView+IBInspectable.swift */,
 				F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */,
 				5600784323FD293D00669AD6 /* UITableView+VisibleSections.swift */,
+				1EE42E1E23FF25CC00BF665A /* ProcessInfo+XCTest.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -691,6 +695,7 @@
 				F51ED28320973CBB008B2434 /* SkeletonCollectionDelegate.swift in Sources */,
 				F58A6E6F20A8C66300612494 /* Recoverable.swift in Sources */,
 				17DD0E18207FB28F00C56334 /* SkeletonView.swift in Sources */,
+				1EE42E2023FF25CC00BF665A /* ProcessInfo+XCTest.swift in Sources */,
 				17DD0E19207FB28F00C56334 /* SkeletonFlow.swift in Sources */,
 				17DD0E09207FB28900C56334 /* SkeletonCollectionDataSource.swift in Sources */,
 				17DD0E0C207FB28900C56334 /* UICollectionView+CollectionSkeleton.swift in Sources */,
@@ -750,6 +755,7 @@
 				F5F899ED1FAB9F04002E8FDA /* CollectionSkeletonProtocol.swift in Sources */,
 				F58A6E6E20A8C66300612494 /* Recoverable.swift in Sources */,
 				F5307E2C1FAF6BC900EE67C5 /* SkeletonGradient.swift in Sources */,
+				1EE42E1F23FF25CC00BF665A /* ProcessInfo+XCTest.swift in Sources */,
 				F587FB86202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift in Sources */,
 				F5F899EB1FAB9DA3002E8FDA /* SkeletonCollectionDataSource.swift in Sources */,
 				F5F622411FAC6E31007C062A /* UIColor+Skeleton.swift in Sources */,
diff --git a/Sources/Collections/UIView+CollectionSkeleton.swift b/Sources/Collections/UIView+CollectionSkeleton.swift
index a293aeb..42fe959 100644
--- a/Sources/Collections/UIView+CollectionSkeleton.swift
+++ b/Sources/Collections/UIView+CollectionSkeleton.swift
@@ -10,19 +10,22 @@ import UIKit
 
 extension UIView {
     func addDummyDataSourceIfNeeded() {
-        guard let collection = self as? CollectionSkeleton else { return }
+        guard let collection = self as? CollectionSkeleton,
+            !ProcessInfo.isRunningXCTest else { return }
         status = .on
         collection.addDummyDataSource()
         collection.disableUserInteraction()
     }
     
     func updateDummyDataSourceIfNeeded() {
-        guard let collection = self as? CollectionSkeleton else { return }
+        guard let collection = self as? CollectionSkeleton,
+            !ProcessInfo.isRunningXCTest else { return }
         collection.updateDummyDataSource()
     }
     
     func removeDummyDataSourceIfNeeded(reloadAfter reload: Bool = true) {
-        guard let collection = self as? CollectionSkeleton else { return }
+        guard let collection = self as? CollectionSkeleton,
+            !ProcessInfo.isRunningXCTest else { return }
         status = .off
         collection.removeDummyDataSource(reloadAfter: reload)
         collection.enableUserInteraction()
diff --git a/Sources/Extensions/ProcessInfo+XCTest.swift b/Sources/Extensions/ProcessInfo+XCTest.swift
new file mode 100644
index 0000000..d5c6166
--- /dev/null
+++ b/Sources/Extensions/ProcessInfo+XCTest.swift
@@ -0,0 +1,13 @@
+// Copyright © 2020 SkeletonView. All rights reserved.
+
+import Foundation
+
+extension ProcessInfo {
+    enum Constants {
+        static let testConfigurationFilePathKey = "XCTestConfigurationFilePath"
+    }
+    
+    static var isRunningXCTest: Bool {
+        return processInfo.environment[Constants.testConfigurationFilePathKey] != nil
+    }
+}
diff --git a/Sources/SkeletonConfig.swift b/Sources/SkeletonConfig.swift
index cd6628f..59d13ad 100644
--- a/Sources/SkeletonConfig.swift
+++ b/Sources/SkeletonConfig.swift
@@ -28,7 +28,7 @@ struct SkeletonConfig {
         gradientDirection: GradientDirection? = nil,
         animated: Bool = false,
         animation: SkeletonLayerAnimation? = nil,
-        transition: SkeletonTransitionStyle = .none
+        transition: SkeletonTransitionStyle = .crossDissolve(0.25)
         ) {
         self.type = type
         self.colors = colors
diff --git a/Sources/SkeletonView.swift b/Sources/SkeletonView.swift
index 678800f..19ba057 100755
--- a/Sources/SkeletonView.swift
+++ b/Sources/SkeletonView.swift
@@ -7,8 +7,8 @@ public extension UIView {
     ///
     /// - Parameters:
     ///   - color: The color of the skeleton. Defaults to `SkeletonAppearance.default.tintColor`.
-    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.none`.
-    func showSkeleton(usingColor color: UIColor = SkeletonAppearance.default.tintColor, transition: SkeletonTransitionStyle = .none) {
+    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.crossDissolve(0.25)`.
+    func showSkeleton(usingColor color: UIColor = SkeletonAppearance.default.tintColor, transition: SkeletonTransitionStyle = .crossDissolve(0.25)) {
         let config = SkeletonConfig(type: .solid, colors: [color], transition: transition)
         showSkeleton(skeletonConfig: config)
     }
@@ -17,8 +17,8 @@ public extension UIView {
     ///
     /// - Parameters:
     ///   - gradient: The gradient of the skeleton. Defaults to `SkeletonAppearance.default.gradient`.
-    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.none`.
-    func showGradientSkeleton(usingGradient gradient: SkeletonGradient = SkeletonAppearance.default.gradient, transition: SkeletonTransitionStyle = .none) {
+    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.crossDissolve(0.25)`.
+    func showGradientSkeleton(usingGradient gradient: SkeletonGradient = SkeletonAppearance.default.gradient, transition: SkeletonTransitionStyle = .crossDissolve(0.25)) {
         let config = SkeletonConfig(type: .gradient, colors: gradient.colors, transition: transition)
         showSkeleton(skeletonConfig: config)
     }
@@ -30,8 +30,8 @@ public extension UIView {
     /// - Parameters:
     ///   - color: The color of skeleton. Defaults to `SkeletonAppearance.default.tintColor`.
     ///   - animation: The animation of the skeleton. Defaults to `nil`.
-    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.none`.
-    func showAnimatedSkeleton(usingColor color: UIColor = SkeletonAppearance.default.tintColor, animation: SkeletonLayerAnimation? = nil, transition: SkeletonTransitionStyle = .none) {
+    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.crossDissolve(0.25)`.
+    func showAnimatedSkeleton(usingColor color: UIColor = SkeletonAppearance.default.tintColor, animation: SkeletonLayerAnimation? = nil, transition: SkeletonTransitionStyle = .crossDissolve(0.25)) {
         let config = SkeletonConfig(type: .solid, colors: [color], animated: true, animation: animation, transition: transition)
         showSkeleton(skeletonConfig: config)
     }
@@ -43,8 +43,8 @@ public extension UIView {
     /// - Parameters:
     ///   - gradient: The gradient of the skeleton. Defaults to `SkeletonAppearance.default.gradient`.
     ///   - animation: The animation of the skeleton. Defaults to `nil`.
-    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.none`.
-    func showAnimatedGradientSkeleton(usingGradient gradient: SkeletonGradient = SkeletonAppearance.default.gradient, animation: SkeletonLayerAnimation? = nil, transition: SkeletonTransitionStyle = .none) {
+    ///   - transition: The style of the transition when the skeleton appears. Defaults to `.crossDissolve(0.25)`.
+    func showAnimatedGradientSkeleton(usingGradient gradient: SkeletonGradient = SkeletonAppearance.default.gradient, animation: SkeletonLayerAnimation? = nil, transition: SkeletonTransitionStyle = .crossDissolve(0.25)) {
         let config = SkeletonConfig(type: .gradient, colors: gradient.colors, animated: true, animation: animation, transition: transition)
         showSkeleton(skeletonConfig: config)
     }
@@ -74,7 +74,7 @@ public extension UIView {
         recursiveLayoutSkeletonIfNeeded(root: self)
     }
     
-    func hideSkeleton(reloadDataAfter reload: Bool = true, transition: SkeletonTransitionStyle = .none) {
+    func hideSkeleton(reloadDataAfter reload: Bool = true, transition: SkeletonTransitionStyle = .crossDissolve(0.25)) {
         flowDelegate?.willBeginHidingSkeletons(rootView: self)
         recursiveHideSkeleton(reloadDataAfter: reload, transition: transition, root: self)
     }
@@ -100,7 +100,8 @@ extension UIView {
     }
 
     @objc func skeletonTraitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
-        guard isSkeletonActive, let config = currentSkeletonConfig else { return }
+        skeletonTraitCollectionDidChange(previousTraitCollection)
+        guard isSkeletonable, isSkeletonActive, let config = currentSkeletonConfig else { return }
         updateSkeleton(skeletonConfig: config)
     }
     
@@ -112,7 +113,7 @@ extension UIView {
     }
 
     private func recursiveShowSkeleton(skeletonConfig config: SkeletonConfig, root: UIView? = nil) {
-        guard !isSkeletonActive && isSkeletonable else { return }
+        guard isSkeletonable && !isSkeletonActive else { return }
         currentSkeletonConfig = config
         swizzleLayoutSubviews()
         swizzleTraitCollectionDidChange()