diff --git a/pom.xml b/pom.xml
index cb56f66..b95dddd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.sumologic.shellbase</groupId>
   <artifactId>all</artifactId>
   <name>all</name>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <licenses>
     <license>
@@ -26,14 +26,28 @@
 
   <properties>
     <scala.version.major>2.11</scala.version.major>
-    <scala.version>${scala.version.major}.8</scala.version>
-    <akka.version>2.3.11</akka.version>
+    <scala.version>${scala.version.major}.12</scala.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.scalatest</groupId>
       <artifactId>scalatest_${scala.version.major}</artifactId>
-      <version>2.2.6</version>
+      <version>3.0.8</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.28.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+      <version>4.12</version>
     </dependency>
   </dependencies>
   <build>
@@ -44,7 +58,7 @@
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.1.6</version>
+        <version>3.4.6</version>
         <executions>
           <execution>
             <id>test-compile</id>
@@ -68,7 +82,7 @@
           <!-- Enable that when we will migrate to new Scala major version (e.g. 2.11) -->
           <checkMultipleScalaVersions>false</checkMultipleScalaVersions>
           <args>
-            <arg>-target:jvm-1.6</arg>
+            <arg>-target:jvm-1.8</arg>
             <arg>-dependencyfile</arg>
             <arg>${project.build.directory}/.scala_dependencies</arg>
             <arg>-deprecation</arg>
@@ -90,7 +104,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.2.1</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -104,7 +118,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.22.2</version>
         <configuration>
           <skipTests>true</skipTests>
         </configuration>
@@ -113,7 +127,7 @@
       <plugin>
         <groupId>org.scalatest</groupId>
         <artifactId>scalatest-maven-plugin</artifactId>
-        <version>1.0</version>
+        <version>2.0.0</version>
         <configuration>
           <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
           <junitxml>.</junitxml>
@@ -131,7 +145,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.5.201505241946</version>
+        <version>0.8.4</version>
         <executions>
           <execution>
             <goals>
@@ -187,7 +201,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.5</version>
+        <version>1.6</version>
         <executions>
           <execution>
             <id>sign-artifacts</id>
@@ -201,7 +215,7 @@
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.5.1</version>
+        <version>1.6.8</version>
         <extensions>true</extensions>
         <configuration>
           <serverId>sonatype-nexus-staging</serverId>
diff --git a/shellbase-core/pom.xml b/shellbase-core/pom.xml
index 6d9af88..2d3e521 100644
--- a/shellbase-core/pom.xml
+++ b/shellbase-core/pom.xml
@@ -3,12 +3,12 @@
   <artifactId>shellbase-core</artifactId>
   <name>shellbase-core</name>
   <packaging>jar</packaging>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <parent>
     <artifactId>all</artifactId>
     <groupId>com.sumologic.shellbase</groupId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -26,25 +26,25 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.9.3</version>
+      <version>2.10.2</version>
     </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.21</version>
+      <version>1.7.26</version>
     </dependency>
 
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
+      <version>1.4</version>
     </dependency>
 
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.6</version>
     </dependency>
 
     <dependency>
@@ -64,28 +64,6 @@
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
     </dependency>
-
-    <!-- Test Dependencies. -->
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_${scala.version.major}</artifactId>
-      <scope>test</scope>
-      <version>2.1.7</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-      <version>4.12</version>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ScriptRendererSpec.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ScriptRendererSpec.scala
index 6dd1335..08d3146 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ScriptRendererSpec.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ScriptRendererSpec.scala
@@ -21,7 +21,7 @@ package com.sumologic.shellbase
 import java.io.File
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ScriptRendererSpec extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBannerTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBannerTest.scala
index 2556ea4..7a0abf9 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBannerTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBannerTest.scala
@@ -19,7 +19,7 @@
 package com.sumologic.shellbase
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellBannerTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBaseTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBaseTest.scala
index 073d6e5..6ef1a7f 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBaseTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellBaseTest.scala
@@ -22,11 +22,10 @@ import java.util
 import java.util.concurrent.Semaphore
 
 import com.sumologic.shellbase.notifications.{InMemoryShellNotificationManager, ShellNotification, ShellNotificationManager}
-import jline.console.completer.CandidateListCompletionHandler
 import org.apache.commons.cli.CommandLine
 import org.junit.runner.RunWith
 import org.scalatest.concurrent.Eventually
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import sun.misc.Signal
 import org.mockito.Mockito._
 
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellColorsTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellColorsTest.scala
index ea65855..cd3cac8 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellColorsTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellColorsTest.scala
@@ -19,7 +19,7 @@
 package com.sumologic.shellbase
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellColorsTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandAliasTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandAliasTest.scala
index 90bdd40..c19f381 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandAliasTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandAliasTest.scala
@@ -19,11 +19,11 @@
 package com.sumologic.shellbase
 
 import com.sumologic.shellbase.cmdline.RichCommandLine._
-import com.sumologic.shellbase.cmdline.{CommandLineOption, RichCommandLine}
+import com.sumologic.shellbase.cmdline.CommandLineOption
 import org.apache.commons.cli.{CommandLine, Options}
 import org.junit.runner.RunWith
 import org.mockito.Mockito._
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellCommandAliasTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandSetTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandSetTest.scala
index adddc31..fd60e67 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandSetTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellCommandSetTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase
 
 import org.apache.commons.cli.CommandLine
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellCommandSetTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellFormattingTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellFormattingTest.scala
index 45c54e5..6a23aab 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellFormattingTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellFormattingTest.scala
@@ -19,7 +19,7 @@
 package com.sumologic.shellbase
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellFormattingTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellHighlightsTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellHighlightsTest.scala
index 1e4d5c3..19520f3 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellHighlightsTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellHighlightsTest.scala
@@ -19,7 +19,7 @@
 package com.sumologic.shellbase
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellHighlightsTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPromptValidatorsTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPromptValidatorsTest.scala
index 368346b..9b76a13 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPromptValidatorsTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPromptValidatorsTest.scala
@@ -23,7 +23,7 @@ import java.nio.file.Files
 
 import com.sumologic.shellbase.ShellPromptValidators._
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellPromptValidatorsTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPrompterTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPrompterTest.scala
index 1af9012..b01b5e2 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPrompterTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellPrompterTest.scala
@@ -24,11 +24,11 @@ import java.util.Date
 
 import jline.console.ConsoleReader
 import org.junit.runner.RunWith
-import org.mockito.Matchers._
+import org.mockito.ArgumentMatchers.{eq => matcheq, _}
 import org.mockito.Mockito._
 import org.scalatest.BeforeAndAfterEach
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.mock.MockitoSugar
+import org.scalatestplus.junit.JUnitRunner
+import org.scalatestplus.mockito.MockitoSugar
 
 import scala.collection.mutable
 
@@ -291,6 +291,7 @@ class ShellPrompterTest extends CommonWordSpec with BeforeAndAfterEach with Mock
 
   private def answerQuestionWith(str1: String, str: String*): Unit = {
     when(mockReader.readLine(anyString, anyChar)).thenReturn(str1, str: _*)
+    when(mockReader.readLine(anyString, matcheq(null))).thenReturn(str1, str: _*)
   }
 
   private def feedCharacters(string: String): Unit = {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellStringSupportTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellStringSupportTest.scala
index b96d9de..f8c0e3c 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellStringSupportTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/ShellStringSupportTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase
 
 import com.sumologic.shellbase.ShellStringSupport._
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ShellStringSupportTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/ArgumentTrackingOptionsTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/ArgumentTrackingOptionsTest.scala
index fc8d1a2..d2e3472 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/ArgumentTrackingOptionsTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/ArgumentTrackingOptionsTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.cmdline
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ArgumentTrackingOptionsTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/CommandLineValidatorsTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/CommandLineValidatorsTest.scala
index 30d6738..735c2e6 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/CommandLineValidatorsTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/CommandLineValidatorsTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.cmdline
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class CommandLineValidatorsTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichCommandLineTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichCommandLineTest.scala
index 1974588..1c44173 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichCommandLineTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichCommandLineTest.scala
@@ -22,7 +22,7 @@ import com.sumologic.shellbase.CommonWordSpec
 import com.sumologic.shellbase.cmdline.RichCommandLine._
 import org.apache.commons.cli.Options
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class RichCommandLineTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichScalaOptionTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichScalaOptionTest.scala
index e46d124..9eeb246 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichScalaOptionTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/cmdline/RichScalaOptionTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.cmdline
 
 import com.sumologic.shellbase.{CommonWordSpec, ExitShellCommandException}
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class RichScalaOptionTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ClearCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ClearCommandTest.scala
index 3397b31..17e8eae 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ClearCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ClearCommandTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.commands
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ClearCommandTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/EchoCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/EchoCommandTest.scala
index a342a33..f2083c8 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/EchoCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/EchoCommandTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.commands
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class EchoCommandTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ExitCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ExitCommandTest.scala
index ed9ed16..020dd57 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ExitCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/ExitCommandTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.commands
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class ExitCommandTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/RunScriptCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/RunScriptCommandTest.scala
index 2903dc8..2b18b0d 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/RunScriptCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/RunScriptCommandTest.scala
@@ -22,7 +22,7 @@ import java.io.File
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class RunScriptCommandTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/SleepCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/SleepCommandTest.scala
index 7868a62..cdad2ec 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/SleepCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/SleepCommandTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.commands
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class SleepCommandTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TeeCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TeeCommandTest.scala
index a5c3759..7289b4c 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TeeCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TeeCommandTest.scala
@@ -23,7 +23,7 @@ import java.nio.file.{Files, Path}
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.collection.JavaConverters._
 import scala.util.Random
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TimeCommandTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TimeCommandTest.scala
index ad4f47a..1fb9d9f 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TimeCommandTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/commands/TimeCommandTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.commands
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class TimeCommandTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/interrupts/KillableSingleThreadTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/interrupts/KillableSingleThreadTest.scala
index 3c02f29..590791b 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/interrupts/KillableSingleThreadTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/interrupts/KillableSingleThreadTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.interrupts
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/InMemoryShellNotificationManagerTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/InMemoryShellNotificationManagerTest.scala
index 1459515..f6300da 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/InMemoryShellNotificationManagerTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/InMemoryShellNotificationManagerTest.scala
@@ -22,8 +22,8 @@ import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
 import org.mockito.Mockito._
 import org.scalatest.BeforeAndAfterEach
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.mock.MockitoSugar
+import org.scalatestplus.junit.JUnitRunner
+import org.scalatestplus.mockito.MockitoSugar
 
 @RunWith(classOf[JUnitRunner])
 class InMemoryShellNotificationManagerTest extends CommonWordSpec with BeforeAndAfterEach with MockitoSugar {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/NotificationCommandSetTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/NotificationCommandSetTest.scala
index 6978563..d57b416 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/NotificationCommandSetTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/notifications/NotificationCommandSetTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.notifications
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class NotificationCommandSetTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/table/ASCIITableTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/table/ASCIITableTest.scala
index 19741f0..59a3121 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/table/ASCIITableTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/table/ASCIITableTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.table
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 
 @RunWith(classOf[JUnitRunner])
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/table/HTMLTableTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/table/HTMLTableTest.scala
index a1e2043..311db4d 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/table/HTMLTableTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/table/HTMLTableTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.table
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class HTMLTableTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimeFormatsTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimeFormatsTest.scala
index 7f4ca27..276eec8 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimeFormatsTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimeFormatsTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.timeutil
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class TimeFormatsTest extends CommonWordSpec {
diff --git a/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimedBlockTest.scala b/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimedBlockTest.scala
index 12856b2..bcf28cf 100644
--- a/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimedBlockTest.scala
+++ b/shellbase-core/src/test/scala/com/sumologic/shellbase/timeutil/TimedBlockTest.scala
@@ -20,7 +20,7 @@ package com.sumologic.shellbase.timeutil
 
 import com.sumologic.shellbase.CommonWordSpec
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class TimedBlockTest extends CommonWordSpec {
diff --git a/shellbase-example/pom.xml b/shellbase-example/pom.xml
index 59df372..782f103 100644
--- a/shellbase-example/pom.xml
+++ b/shellbase-example/pom.xml
@@ -3,12 +3,12 @@
   <artifactId>shellbase-example</artifactId>
   <name>shellbase-example</name>
   <packaging>jar</packaging>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <parent>
     <artifactId>all</artifactId>
     <groupId>com.sumologic.shellbase</groupId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>com.sumologic.shellbase</groupId>
       <artifactId>shellbase-core</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/shellbase-slack/pom.xml b/shellbase-slack/pom.xml
index 2ff12cd..0290d0f 100644
--- a/shellbase-slack/pom.xml
+++ b/shellbase-slack/pom.xml
@@ -3,12 +3,12 @@
   <artifactId>shellbase-slack</artifactId>
   <name>shellbase-slack</name>
   <packaging>jar</packaging>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
 
   <parent>
     <artifactId>all</artifactId>
     <groupId>com.sumologic.shellbase</groupId>
-    <version>1.5.2-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -26,35 +26,13 @@
     <dependency>
       <groupId>com.sumologic.shellbase</groupId>
       <artifactId>shellbase-core</artifactId>
-      <version>1.5.2-SNAPSHOT</version>
+      <version>2.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>com.flyberrycapital</groupId>
-      <artifactId>scala-slack_2.11</artifactId>
-      <version>0.2.0</version>
-    </dependency>
-
-    <!-- Test Dependencies. -->
-    <dependency>
-      <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_${scala.version.major}</artifactId>
-      <scope>test</scope>
-      <version>2.1.7</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.9.5</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-      <version>4.12</version>
+      <artifactId>scala-slack_${scala.version.major}</artifactId>
+      <version>0.3.1</version>
     </dependency>
 
   </dependencies>
diff --git a/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandToSlackTest.scala b/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandToSlackTest.scala
index 2751f9e..a1c72ec 100644
--- a/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandToSlackTest.scala
+++ b/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandToSlackTest.scala
@@ -24,9 +24,9 @@ import com.sumologic.shellbase.ShellCommand
 import org.apache.commons.cli.CommandLine
 import org.junit.runner.RunWith
 import org.scalatest.BeforeAndAfterEach
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import org.mockito.Mockito._
-import org.mockito.Matchers.{eq => matcher_eq, _}
+import org.mockito.ArgumentMatchers.{eq => matcher_eq, _}
 import org.scalatest.mock.MockitoSugar
 
 @RunWith(classOf[JUnitRunner])
diff --git a/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandWithSlackThreadTest.scala b/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandWithSlackThreadTest.scala
index 88d0140..c706b97 100644
--- a/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandWithSlackThreadTest.scala
+++ b/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostCommandWithSlackThreadTest.scala
@@ -24,12 +24,12 @@ import com.flyberrycapital.slack.Responses.PostMessageResponse
 import com.flyberrycapital.slack.SlackClient
 import org.apache.commons.cli.CommandLine
 import org.junit.runner.RunWith
-import org.mockito.Matchers.{any, anyObject, anyString}
+import org.mockito.ArgumentMatchers.{any, anyObject, anyString}
 import org.mockito.Mockito.{times, verify, when}
 import org.scalatest.BeforeAndAfterEach
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 import org.scalatest.mock.MockitoSugar
-import org.mockito.Matchers.{eq => matcher_eq, _}
+import org.mockito.ArgumentMatchers.{eq => matcher_eq, _}
 
 @RunWith(classOf[JUnitRunner])
 class PostCommandWithSlackThreadTest extends CommonWordSpec with BeforeAndAfterEach with MockitoSugar {
diff --git a/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostToSlackHelperTest.scala b/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostToSlackHelperTest.scala
index e63f887..2204a73 100644
--- a/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostToSlackHelperTest.scala
+++ b/shellbase-slack/src/test/scala/com/sumologic/shellbase/slack/PostToSlackHelperTest.scala
@@ -19,7 +19,7 @@
 package com.sumologic.shellbase.slack
 
 import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
+import org.scalatestplus.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class PostToSlackHelperTest extends CommonWordSpec {