diff --git a/MParT/Utilities/ArrayConversions.h b/MParT/Utilities/ArrayConversions.h
index 1032016f..ed9aa73b 100644
--- a/MParT/Utilities/ArrayConversions.h
+++ b/MParT/Utilities/ArrayConversions.h
@@ -226,19 +226,27 @@ namespace mpart{
     @param[in] inview A kokkos array in device memory.
     @return A kokkos array in host memory.  Note that the layout (row-major or col-major) might be different than the default on the Host.  The layout will match the device's default layout.
     */
-    template<typename ScalarType, typename DeviceMemorySpace>
-    typename Kokkos::View<ScalarType, Kokkos::HostSpace>::HostMirror ToHost(Kokkos::View<ScalarType, DeviceMemorySpace> const& inview){
-        typename Kokkos::View<ScalarType, Kokkos::HostSpace>::HostMirror outview = Kokkos::create_mirror_view(inview);
+    // template<typename ScalarType, typename DeviceMemorySpace>
+    // typename Kokkos::View<ScalarType, Kokkos::HostSpace>::HostMirror ToHost(Kokkos::View<ScalarType, DeviceMemorySpace> const& inview){
+    //     typename Kokkos::View<ScalarType, Kokkos::HostSpace>::HostMirror outview = Kokkos::create_mirror_view(inview);
+    //     Kokkos::deep_copy (outview, inview);
+    //     return outview;
+    // }
+
+    template<class ViewType>
+    typename ViewType::HostMirror ToHost(ViewType const& inview){
+        typename ViewType::HostMirror outview = Kokkos::create_mirror_view(inview);
         Kokkos::deep_copy (outview, inview);
         return outview;
     }
 
-    template<typename DeviceMemoryType,typename ScalarType>
-    StridedMatrix<ScalarType, Kokkos::HostSpace> ToHost(StridedMatrix<ScalarType,DeviceMemoryType> const& inview){
-        typename StridedMatrix<ScalarType,DeviceMemoryType>::HostMirror outview = Kokkos::create_mirror_view(inview);
-        Kokkos::deep_copy (outview, inview);
-        return outview;
-    }
+
+    // template<typename DeviceMemoryType,typename ScalarType>
+    // StridedMatrix<ScalarType, Kokkos::HostSpace> ToHost(StridedMatrix<ScalarType,DeviceMemoryType> const& inview){
+    //     typename StridedMatrix<ScalarType,DeviceMemoryType>::HostMirror outview = Kokkos::create_mirror_view(inview);
+    //     Kokkos::deep_copy (outview, inview);
+    //     return outview;
+    // }
 
     /**
     @brief Copies a range of elements from a Kokkos array in device to host memory
@@ -272,13 +280,13 @@ namespace mpart{
     @tparam ScalarType The type and dimension of the Kokkos::View (e.g., double*, double**, or int*)
     @tparam SliceTypes A variadic parameter pack containing options for constructing a Kokkos::subview of the device view.
     */
-    template<typename DeviceMemoryType, typename ScalarType, class... SliceTypes>
-    Kokkos::View<ScalarType, Kokkos::HostSpace> ToHost(Kokkos::View<ScalarType,DeviceMemoryType> const& inview, SliceTypes... sliceParams){
-        auto subview = Kokkos::subview(inview, sliceParams...); // Construct the subview
-        typename Kokkos::View<ScalarType>::HostMirror outview = Kokkos::create_mirror_view(subview);
-        Kokkos::deep_copy (outview, subview);
-        return outview;
-    }
+    // template<typename DeviceMemoryType, typename ScalarType, class... SliceTypes>
+    // Kokkos::View<ScalarType, Kokkos::HostSpace> ToHost(Kokkos::View<ScalarType,DeviceMemoryType> const& inview, SliceTypes... sliceParams){
+    //     auto subview = Kokkos::subview(inview, sliceParams...); // Construct the subview
+    //     typename Kokkos::View<ScalarType>::HostMirror outview = Kokkos::create_mirror_view(subview);
+    //     Kokkos::deep_copy (outview, subview);
+    //     return outview;
+    // }
 
 
 #if defined(MPART_ENABLE_GPU)
diff --git a/tests/Test_LinearAlgebra.cpp b/tests/Test_LinearAlgebra.cpp
index 3067dfa9..527c2294 100644
--- a/tests/Test_LinearAlgebra.cpp
+++ b/tests/Test_LinearAlgebra.cpp
@@ -399,7 +399,7 @@ TEST_CASE( "Testing LU Factorization on Device", "LinearAlgebra_LUDevice" ) {
         }
     }
     SECTION("Compute Determinant") {
-        PartialPivLU<Kokkos::HostSpace> Alu_d(constA_d);
+        PartialPivLU<mpart::DeviceSpace> Alu_d(constA_d);
         CHECK(Alu_d.determinant() == Approx(eigA.determinant()).epsilon(1e-14).margin(1e-14));
     }
 }
@@ -424,12 +424,12 @@ TEST_CASE( "Testing Cholesky Factorization", "LinearAlgebra_Cholesky" ) {
     Eigen::MatrixXd eigY = eigA.llt().matrixL().solve(eigB);
 
     SECTION("Compute Cholesky") {
-        Cholesky<Kokkos::HostSpace> Achol_d(constA_d);
+        Cholesky<mpart::DeviceSpace> Achol_d(constA_d);
     }
     SECTION("Solve Cholesky inplace") {
         Kokkos::View<double**, Kokkos::LayoutLeft, mpart::DeviceSpace> C_d("C", 3, 2);
         Kokkos::deep_copy(C_d, B_d);
-        Cholesky<Kokkos::HostSpace> Achol_d(constA_d);
+        Cholesky<mpart::DeviceSpace> Achol_d(constA_d);
         Achol_d.solveInPlace(C_d);
         auto C_h = ToHost(C_d);
         for(unsigned int j=0; j<C_h.extent(1); ++j){
@@ -441,7 +441,7 @@ TEST_CASE( "Testing Cholesky Factorization", "LinearAlgebra_Cholesky" ) {
     SECTION("Solve Cholesky L inplace") {
         Kokkos::View<double**, Kokkos::LayoutLeft, mpart::DeviceSpace> C_d("C", 3, 2);
         Kokkos::deep_copy(C_d, B_d);
-        Cholesky<Kokkos::HostSpace> Achol_d(constA_d);
+        Cholesky<mpart::DeviceSpace> Achol_d(constA_d);
         Achol_d.solveInPlaceL(C_d);
         auto C_h = ToHost(C_d);
         for(unsigned int j=0; j<C_h.extent(1); ++j){
@@ -451,7 +451,7 @@ TEST_CASE( "Testing Cholesky Factorization", "LinearAlgebra_Cholesky" ) {
         }
     }
     SECTION("Solve Cholesky out of place") {
-        Cholesky<Kokkos::HostSpace> Achol_d(constA_d);
+        Cholesky<mpart::DeviceSpace> Achol_d(constA_d);
         auto C_d = Achol_d.solve(B_d);
         auto C_h = ToHost(C_d);
         for(unsigned int j=0; j<C_h.extent(1); ++j){
@@ -461,7 +461,7 @@ TEST_CASE( "Testing Cholesky Factorization", "LinearAlgebra_Cholesky" ) {
         }
     }
     SECTION("Compute Determinant") {
-        Cholesky<Kokkos::HostSpace> Achol_d(constA_d);
+        Cholesky<mpart::DeviceSpace> Achol_d(constA_d);
         CHECK(Achol_d.determinant() == Approx(eigA.determinant()).epsilon(1e-14).margin(1e-14));
     }
 }