diff --git a/src/dae_default_alg.jl b/src/dae_default_alg.jl
index 332dbd5cb..0f39117d0 100644
--- a/src/dae_default_alg.jl
+++ b/src/dae_default_alg.jl
@@ -1,4 +1,4 @@
-function default_algorithm{uType,duType,tType,isinplace}(prob::DiffEqBase.AbstractDAEProblem{uType,duType,tType,isinplace};kwargs...)
+function default_algorithm(prob::DiffEqBase.AbstractDAEProblem{uType,duType,tType,isinplace};kwargs...) where {uType,duType,tType,isinplace}
   o = Dict{Symbol,Any}(kwargs)
   extra_kwargs = Any[]; alg=IDA() # Standard default
   uEltype = eltype(prob.u0)
diff --git a/src/dde_default_alg.jl b/src/dde_default_alg.jl
index 728138456..70363f64f 100644
--- a/src/dde_default_alg.jl
+++ b/src/dde_default_alg.jl
@@ -1,4 +1,4 @@
-function default_algorithm{uType,tType,lType,isinplace}(prob::DiffEqBase.AbstractDDEProblem{uType,tType,lType,isinplace};kwargs...)
+function default_algorithm(prob::DiffEqBase.AbstractDDEProblem{uType,tType,lType,isinplace};kwargs...) where {uType,tType,lType,isinplace}
   o = Dict{Symbol,Any}(kwargs)
   extra_kwargs = Any[]; alg = MethodOfSteps(AutoTsit5(Rosenbrock23(autodiff=false))) # Standard default
   uEltype = eltype(prob.u0)
diff --git a/src/default_solve.jl b/src/default_solve.jl
index b55b38448..04b86fc76 100644
--- a/src/default_solve.jl
+++ b/src/default_solve.jl
@@ -6,7 +6,7 @@ function DiffEqBase.__solve(prob::DiffEqBase.DEProblem,args...;default_set=false
   end
 end
 
-function DiffEqBase.__solve(prob::DiffEqBase.DEProblem,alg::Union{Void,DiffEqBase.DEAlgorithm},
+function DiffEqBase.__solve(prob::DiffEqBase.DEProblem,alg::Union{Nothing,DiffEqBase.DEAlgorithm},
                args...;default_set=false,kwargs...)
   if default_set == true
     error("The chosen algorithm, $alg, does not exist. Please verify that the appropriate solver package has been installed.")
diff --git a/src/ode_default_alg.jl b/src/ode_default_alg.jl
index 0674a1f39..4c0c4c3e2 100644
--- a/src/ode_default_alg.jl
+++ b/src/ode_default_alg.jl
@@ -1,4 +1,4 @@
-function default_algorithm{uType,tType,inplace}(prob::DiffEqBase.AbstractODEProblem{uType,tType,inplace};kwargs...)
+function default_algorithm(prob::DiffEqBase.AbstractODEProblem{uType,tType,inplace};kwargs...) where {uType,tType,inplace}
   o = Dict{Symbol,Any}(kwargs)
   extra_kwargs = Any[]; alg=AutoTsit5(Rosenbrock23(autodiff=false)) # Standard default
   uEltype = eltype(prob.u0)
diff --git a/src/sde_default_alg.jl b/src/sde_default_alg.jl
index e4274e2bf..d084cca8f 100644
--- a/src/sde_default_alg.jl
+++ b/src/sde_default_alg.jl
@@ -1,4 +1,4 @@
-function default_algorithm{uType,tType,isinplace,ND}(prob::DiffEqBase.AbstractSDEProblem{uType,tType,isinplace,ND};kwargs...)
+function default_algorithm(prob::DiffEqBase.AbstractSDEProblem{uType,tType,isinplace,ND};kwargs...) where {uType,tType,isinplace,ND}
   o = Dict{Symbol,Any}(kwargs)
   extra_kwargs = Any[]; alg=SOSRI() # Standard default
   uEltype = eltype(prob.u0)
diff --git a/test/default_dde_alg_test.jl b/test/default_dde_alg_test.jl
index c01243884..6e97278e2 100644
--- a/test/default_dde_alg_test.jl
+++ b/test/default_dde_alg_test.jl
@@ -1,4 +1,4 @@
-using DifferentialEquations, Base.Test
+using DifferentialEquations, Test
 
 lags = [.2]
 f = function (u,h,p,t)
diff --git a/test/default_discrete_alg_test.jl b/test/default_discrete_alg_test.jl
index c51941007..fd0531a98 100644
--- a/test/default_discrete_alg_test.jl
+++ b/test/default_discrete_alg_test.jl
@@ -1,4 +1,4 @@
-using DifferentialEquations, Base.Test
+using DifferentialEquations, Test
 
 prob = DiscreteProblem(zeros(2),(0.0,1.0))
 sol = solve(prob)
diff --git a/test/default_ode_alg_test.jl b/test/default_ode_alg_test.jl
index 6e24ffa0d..8bb31233d 100644
--- a/test/default_ode_alg_test.jl
+++ b/test/default_ode_alg_test.jl
@@ -1,4 +1,4 @@
-using DifferentialEquations, DiffEqProblemLibrary, Base.Test
+using DifferentialEquations, DiffEqProblemLibrary, Test
 
 using DiffEqProblemLibrary.ODEProblemLibrary: importodeproblems; importodeproblems()
 import DiffEqProblemLibrary.ODEProblemLibrary: prob_ode_2Dlinear
@@ -56,11 +56,11 @@ sol =solve(prob_ode_bigfloat2Dlinear,nothing;alg_hints=[:stiff])
 
 @test typeof(sol.alg) <: Rodas4
 
-immutable FooAlg end
+struct FooAlg end
 
 @test_throws ErrorException solve(prob_ode_bigfloat2Dlinear,FooAlg();default_set=true)
 
-immutable FooAlg2 <: DiffEqBase.DEAlgorithm end
+struct FooAlg2 <: DiffEqBase.DEAlgorithm end
 
 @test_throws ErrorException solve(prob_ode_bigfloat2Dlinear,FooAlg2();default_set=true)
 
diff --git a/test/default_rode_alg_test.jl b/test/default_rode_alg_test.jl
index 0ba0cbf6e..dbcb51b1d 100644
--- a/test/default_rode_alg_test.jl
+++ b/test/default_rode_alg_test.jl
@@ -1,4 +1,4 @@
-using DifferentialEquations, Base.Test
+using DifferentialEquations, Test
 
 f = (u,p,t,W) -> 1.01u.+0.87u.*W
 u0 = 1.00
diff --git a/test/default_sde_alg_test.jl b/test/default_sde_alg_test.jl
index f46737a98..a7e15f833 100644
--- a/test/default_sde_alg_test.jl
+++ b/test/default_sde_alg_test.jl
@@ -1,4 +1,4 @@
-using DifferentialEquations, DiffEqProblemLibrary, Base.Test
+using DifferentialEquations, DiffEqProblemLibrary, Test
 
 using DiffEqProblemLibrary.SDEProblemLibrary: importsdeproblems; importsdeproblems()
 import DiffEqProblemLibrary.SDEProblemLibrary: prob_sde_additive
diff --git a/test/default_steady_state_alg_test.jl b/test/default_steady_state_alg_test.jl
index 453812058..42b22a01f 100644
--- a/test/default_steady_state_alg_test.jl
+++ b/test/default_steady_state_alg_test.jl
@@ -1,4 +1,4 @@
-using DifferentialEquations, Base.Test
+using DifferentialEquations, Test
 
 f = function (du,u,p,t)
   du[1] = 2 - 2u[1]
diff --git a/test/runtests.jl b/test/runtests.jl
index d7254050e..6c11cee3f 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,6 +1,6 @@
 #!/usr/bin/env julia
 
-using DifferentialEquations, Base.Test
+using DifferentialEquations, Test
 println("Starting tests")
 @time @testset "Default Discrete Algorithm" begin include("default_discrete_alg_test.jl") end
 @time @testset "Default ODE Algorithm" begin include("default_ode_alg_test.jl") end