diff --git a/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme b/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme
index a550676330..d63f7d6baa 100644
--- a/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme
+++ b/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.xcscheme b/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.xcscheme
index d8707355e1..2e6ce96e50 100644
--- a/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.xcscheme
+++ b/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.xcscheme
@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/Charts/ChartsTests/BarChartTests.swift b/Charts/ChartsTests/BarChartTests.swift
index 1abef08792..af09c08b3f 100644
--- a/Charts/ChartsTests/BarChartTests.swift
+++ b/Charts/ChartsTests/BarChartTests.swift
@@ -54,25 +54,26 @@ class BarChartTests: FBSnapshotTestCase
     
     func testHideLeftAxis()
     {
-        chart.leftAxis.drawAxisLineEnabled = false
+        chart.leftAxis.enabled = false
         FBSnapshotVerifyView(chart)
     }
     
     func testHideRightAxis()
     {
-        chart.rightAxis.drawAxisLineEnabled = false
+        chart.rightAxis.enabled = false
         FBSnapshotVerifyView(chart)
     }
     
-    func testHideLeftAxisGridlines()
+    func testHideHorizontalGridlines()
     {
         chart.leftAxis.drawGridLinesEnabled = false
+        chart.rightAxis.drawGridLinesEnabled = false
         FBSnapshotVerifyView(chart)
     }
     
-    func testHideRightAxisGridlines()
+    func testHideVerticalGridlines()
     {
-        chart.rightAxis.drawGridLinesEnabled = false
+        chart.xAxis.drawGridLinesEnabled = false
         FBSnapshotVerifyView(chart)
     }
 }
diff --git a/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png
new file mode 100644
index 0000000000..1d79e4a8ce
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png
new file mode 100644
index 0000000000..c2fd78ac87
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png
new file mode 100644
index 0000000000..13878788ba
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png
new file mode 100644
index 0000000000..32a7797529
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png
new file mode 100644
index 0000000000..a0993e103c
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png
new file mode 100644
index 0000000000..f538677da7
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@3x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@3x.png
new file mode 100644
index 0000000000..39b292947c
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testDefaultValues@3x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png
new file mode 100644
index 0000000000..c2fd78ac87
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@3x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@3x.png
new file mode 100644
index 0000000000..92fdcb1fcd
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideHorizontalGridlines@3x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png
index 6b8ce5f1b9..7c868f245f 100644
Binary files a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@3x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@3x.png
new file mode 100644
index 0000000000..d7ab4f33da
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxis@3x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxisGridlines@2x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxisGridlines@2x.png
deleted file mode 100644
index 897d33df75..0000000000
Binary files a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideLeftAxisGridlines@2x.png and /dev/null differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png
index 02342fc16f..7995cb734b 100644
Binary files a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@3x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@3x.png
new file mode 100644
index 0000000000..6dc1a9d89f
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxis@3x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxisGridlines@2x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxisGridlines@2x.png
deleted file mode 100644
index 897d33df75..0000000000
Binary files a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideRightAxisGridlines@2x.png and /dev/null differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png
new file mode 100644
index 0000000000..a0993e103c
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@3x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@3x.png
new file mode 100644
index 0000000000..b296e0cf16
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHideVerticalGridlines@3x.png differ
diff --git a/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@3x.png b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@3x.png
new file mode 100644
index 0000000000..6b6e9c0a8e
Binary files /dev/null and b/Charts/ChartsTests/ReferenceImages_64/ChartsTests.BarChartTests/testHidesValues@3x.png differ