diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
deleted file mode 100644
index 807f4f4a..00000000
--- a/.github/workflows/cmake.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-name: CMake
-
-on: [push, pull_request]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: RelWithDebInfo
-
-jobs:
-  build-mdspan:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - compiler_driver: g++
-          compiler_prefix: /usr/bin
-    steps:
-    - name: Create Build Environment
-      run: cmake -E make_directory mdspan-build
-      
-    - name: Check Out
-      uses: actions/checkout@v4
-      with:
-        repository: kokkos/mdspan
-        path: mdspan-src
-      
-    - name: Configure CMake
-      working-directory: mdspan-build
-      run: cmake $GITHUB_WORKSPACE/mdspan-src -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/mdspan-install
-      
-    - name: Build
-      working-directory: mdspan-build
-      run: make
-      
-    - name: Install
-      working-directory: mdspan-build
-      run: make install
-      
-    - name: Upload
-      uses: actions/upload-artifact@v4
-      with:
-        name: mdspan
-        path: mdspan-install
-
-  build-stdblas:
-    runs-on: ubuntu-latest
-    needs: build-mdspan
-    
-    steps:
-    - name: Download mdspan
-      uses: actions/download-artifact@v4
-      with:
-        name: mdspan
-        path: mdspan-install 
-        
-    - name: Create Build Environment
-      run: cmake -E make_directory stdblas-build
-        
-    - name: Check Out
-      uses: actions/checkout@v4
-      with:
-        path: stdblas-src
-        
-    - name: Configure CMake
-      shell: bash
-      working-directory: stdblas-build
-      run: cmake $GITHUB_WORKSPACE/stdblas-src -Dmdspan_DIR=$GITHUB_WORKSPACE/mdspan-install -DLINALG_ENABLE_TESTS=On -DLINALG_ENABLE_EXAMPLES=On -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/stdblas-install
-
-    - name: Build
-      working-directory: stdblas-build
-      shell: bash
-      run: make
-      
-    - name: Tar files
-      shell: bash
-      run: tar -cvf stdblas.tar *
-
-    - name: Upload workspace
-      uses: actions/upload-artifact@v4
-      with:
-        name: stdblas
-        path: stdblas.tar
-        
-  test-stdBLAS:
-    runs-on: ubuntu-latest
-    needs: build-stdblas
-    
-    steps:
-    
-    - name: Download workspace
-      uses: actions/download-artifact@v4
-      with:
-        name: stdblas
-        path: .
-        
-    - name: Untar files
-      shell: bash
-      run: tar -xvf stdblas.tar
-        
-    - name: Test
-      working-directory: stdblas-build
-      shell: bash
-      run: ctest --output-on-failure
-        
-    - name: Install
-      working-directory: stdblas-build
-      shell: bash
-      run: make install
diff --git a/.github/workflows/macos.yml b/.github/workflows/ghaction.yml
similarity index 93%
rename from .github/workflows/macos.yml
rename to .github/workflows/ghaction.yml
index 6b0bd078..739776da 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/ghaction.yml
@@ -1,4 +1,4 @@
-name: MacOS
+name: stdBLAS
 
 on: [push, pull_request]
 
@@ -7,8 +7,11 @@ env:
   BUILD_TYPE: RelWithDebInfo
 
 jobs:
-  osx-ci:
-    runs-on: [macos-latest]
+  osmatrix: 
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: Check Out mdspan
diff --git a/tests/native/gtest_fixtures.hpp b/tests/native/gtest_fixtures.hpp
index a9da8842..7ec364e1 100644
--- a/tests/native/gtest_fixtures.hpp
+++ b/tests/native/gtest_fixtures.hpp
@@ -56,8 +56,8 @@ using MdSpan::layout_stride;
 using MdSpan::mdspan;
 using MdSpan::submdspan;
 
-using MdSpanEx::layout_left_padded;
-using MdSpanEx::layout_right_padded;
+using MdSpan::layout_left_padded; // not in experimental namespace
+using MdSpan::layout_right_padded;
 
 using dbl_vector_t = mdspan<double, extents<std::size_t, dynamic_extent>>;
 using cpx_vector_t = mdspan<std::complex<double>, extents<std::size_t, dynamic_extent>>;