Attempting to fix build errors in CI regarding unit tests