37 files changed, 1852 insertions, 779 deletions
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj
index 6ff1eb1..2093063 100644
--- a/unit_tests/UnitTests.vcxproj
+++ b/unit_tests/UnitTests.vcxproj
@@ -45,6 +45,30 @@
      <Configuration>Debug 5.4</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Prospero">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Win32">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|x64">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Prospero">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Win32">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|x64">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release LuaJIT|Prospero">
      <Configuration>Release LuaJIT</Configuration>
      <Platform>Prospero</Platform>
@@ -125,7 +149,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{aed7f42f-139a-46ba-80fe-16e062ea1345}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
@@ -143,6 +167,9 @@
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
    <UseDebugLibraries>true</UseDebugLibraries>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">
    <UseDebugLibraries>true</UseDebugLibraries>
  </PropertyGroup>
@@ -155,103 +182,123 @@
  <ImportGroup Label="PropertySheets" />
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">
-    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
@@ -261,7 +308,26 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -280,7 +346,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -299,7 +365,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -318,7 +384,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -337,7 +403,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -356,7 +422,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -375,7 +441,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -394,7 +460,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -413,7 +479,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -432,7 +498,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -448,6 +514,27 @@
      </IgnoreSpecificDefaultLibraries>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua55.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -469,7 +556,7 @@
      </IgnoreSpecificDefaultLibraries>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
@@ -477,6 +564,27 @@
      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -494,7 +602,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -555,7 +663,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -575,7 +683,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -636,7 +744,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -656,7 +764,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -717,7 +825,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -738,7 +846,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -800,7 +908,26 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -819,7 +946,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -833,6 +960,24 @@
      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua55.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -852,6 +997,25 @@
      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Release</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\src\compat.hpp" />
    <ClInclude Include="..\src\deep.hpp" />
@@ -864,11 +1028,13 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader>
@@ -876,7 +1042,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">NotUsing</PrecompiledHeader>
@@ -886,7 +1054,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">NotUsing</PrecompiledHeader>
@@ -897,11 +1067,13 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader>
@@ -909,7 +1081,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">NotUsing</PrecompiledHeader>
@@ -919,7 +1093,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">NotUsing</PrecompiledHeader>
@@ -934,6 +1110,7 @@
    <ClCompile Include="init_and_shutdown.cpp" />
    <ClCompile Include="_pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Create</PrecompiledHeader>
@@ -943,8 +1120,11 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">Create</PrecompiledHeader>
@@ -962,13 +1142,28 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\.runsettings" />
+    <None Include="scripts\coro\cancelling_suspended.lua" />
+    <None Include="scripts\coro\collect_yielded_lane.lua" />
+    <None Include="scripts\coro\join_suspended.lua" />
+    <None Include="scripts\coro\linda_in_close_handler.lua" />
+    <None Include="scripts\coro\regular_function.lua" />
+    <None Include="scripts\coro\resume_basics.lua" />
+    <None Include="scripts\coro\yielding_in_non_coro_errors.lua" />
+    <None Include="scripts\lane\body_is_a_c_function.lua" />
+    <None Include="scripts\lane\tasking_cancelling_with_hook.lua" />
+    <None Include="scripts\linda\send_receive_func_and_string.lua" />
+    <None Include="scripts\linda\wake_period.lua" />
+    <None Include="scripts\misc\deeptest.lua" />
+    <None Include="scripts\_utils54.lua" />
    <None Include="UnitTests.makefile" />
-    <None Include="scripts\coro\basics.lua" />
+    <None Include="scripts\coro\index_suspended.lua" />
    <None Include="scripts\coro\error_handling.lua" />
    <None Include="scripts\lane\cooperative_shutdown.lua" />
    <None Include="scripts\lane\stdlib_naming.lua" />
diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters
index 3b45009..df82447 100644
--- a/unit_tests/UnitTests.vcxproj.filters
+++ b/unit_tests/UnitTests.vcxproj.filters
@@ -54,6 +54,9 @@
    <Filter Include="Make">
      <UniqueIdentifier>{c62af5d9-9161-4ca1-9b58-6837e2907e35}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Scripts\misc">
+      <UniqueIdentifier>{1fbb1341-2f93-4eaa-924c-1df79e083704}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="scripts\linda\send_receive.lua">
@@ -95,7 +98,7 @@
    <None Include="scripts\lane\tasking_join_test.lua">
      <Filter>Scripts\lane</Filter>
    </None>
-    <None Include="scripts\coro\basics.lua">
+    <None Include="scripts\coro\index_suspended.lua">
      <Filter>Scripts\coro</Filter>
    </None>
    <None Include="scripts\coro\error_handling.lua">
@@ -113,5 +116,44 @@
    <None Include="..\.runsettings">
      <Filter>Catch2</Filter>
    </None>
+    <None Include="scripts\lane\tasking_cancelling_with_hook.lua">
+      <Filter>Scripts\lane</Filter>
+    </None>
+    <None Include="scripts\linda\wake_period.lua">
+      <Filter>Scripts\linda</Filter>
+    </None>
+    <None Include="scripts\coro\collect_yielded_lane.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\lane\body_is_a_c_function.lua">
+      <Filter>Scripts\lane</Filter>
+    </None>
+    <None Include="scripts\coro\regular_function.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\yielding_in_non_coro_errors.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\resume_basics.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\join_suspended.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\_utils54.lua">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="scripts\coro\linda_in_close_handler.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\cancelling_suspended.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\linda\send_receive_func_and_string.lua">
+      <Filter>Scripts\linda</Filter>
+    </None>
+    <None Include="scripts\misc\deeptest.lua">
+      <Filter>Scripts\misc</Filter>
+    </None>
  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/unit_tests/_pch.hpp b/unit_tests/_pch.hpp
index 1e98c5a..f6e5fff 100644
--- a/unit_tests/_pch.hpp
+++ b/unit_tests/_pch.hpp
@@ -1,5 +1,3 @@
-#pragma once
 #include <atomic>
 #include <cassert>
 #include <filesystem>
diff --git a/unit_tests/deep_tests.cpp b/unit_tests/deep_tests.cpp
index e21072c..f18ff81 100644
--- a/unit_tests/deep_tests.cpp
+++ b/unit_tests/deep_tests.cpp
@@ -92,4 +92,13 @@ TEST_CASE("misc.deep_userdata.example")
            " assert(due.get_deep_count() == 0)"
        );
    }
-}
-\ No newline at end of file
+}
+#define MAKE_TEST_CASE(DIR, FILE, CONDITION) \
+    TEST_CASE("scripted_tests." #DIR "." #FILE) \
+    { \
+        FileRunner _runner(R"(.\unit_tests\scripts)"); \
+        _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \
+    }
+MAKE_TEST_CASE(misc, deeptest, AssertNoLuaError)
diff --git a/unit_tests/embedded_tests.cpp b/unit_tests/embedded_tests.cpp
index 9a262d5..388548d 100644
--- a/unit_tests/embedded_tests.cpp
+++ b/unit_tests/embedded_tests.cpp
@@ -2,6 +2,7 @@
 #include "shared.h"
 #include "lanes/src/lanes.hpp"
+#if defined __has_include && __has_include(<windows.h>)
 #include <windows.h>
 // #################################################################################################
@@ -138,13 +139,13 @@ namespace
 // #################################################################################################
-TEST_CASE("lanes.embedding.with default allocator")
+TEST_CASE("lanes.embedding.with_default_allocator")
 {
    local::EmbeddedLuaState S;
    // ---------------------------------------------------------------------------------------------
-    SECTION("single state")
+    SECTION("single_state")
    {
        // this sends data in a linda. current contents:
        // key: short string
@@ -157,7 +158,7 @@ TEST_CASE("lanes.embedding.with default allocator")
        // function with an upvalue
        std::string_view const _script{
            " local lanes = require 'lanes'.configure{with_timers = false}"
-            " local l = lanes.linda'gleh'"
+            " local l = lanes.linda{name = 'gleh'}"
            " local upvalue = 'oeauaoeuoeuaoeuaoeujaoefubycfjbycfybcfjybcfjybcfjbcf'"
            " local upvalued = function()"
            "     return upvalue"
@@ -171,7 +172,7 @@ TEST_CASE("lanes.embedding.with default allocator")
    // ---------------------------------------------------------------------------------------------
-    SECTION("manual registration")
+    SECTION("manual_registration")
    {
        S.requireSuccess("require 'lanes'.configure{with_timers = false}");
@@ -183,7 +184,7 @@ TEST_CASE("lanes.embedding.with default allocator")
        // try to send io.open into a linda, which fails if io base library is not loaded
        std::string_view const _script{
            " local lanes = require 'lanes'"
-            " local l = lanes.linda'gleh'"
+            " local l = lanes.linda{name = 'gleh'}"
            " l:set('yo', io.open)"
            " return 'SUCCESS'"
        };
@@ -191,7 +192,7 @@ TEST_CASE("lanes.embedding.with default allocator")
        // try again after manual registration
        lua_pushcfunction(S, S.get_lanes_register());                                              // S: lanes_register
-        luaG_pushstring(S, LUA_IOLIBNAME);                                                         // S: lanes_register "io"
+        luaW_pushstring(S, LUA_IOLIBNAME);                                                         // S: lanes_register "io"
        luaL_requiref(S, LUA_IOLIBNAME, luaopen_io, 1);                                            // S: lanes_register "io" io
        lua_call(S, 2, 0);                                                                         // S:
        S.stackCheck(0);
@@ -202,7 +203,8 @@ TEST_CASE("lanes.embedding.with default allocator")
 // #################################################################################################
 // this is not really a test yet, just something sitting here until it is converted properly
-TEST_CASE("lanes.embedding.with custom allocator")
+// currently it crashes with moonjit (but maybe I just need a more recent moonjit version)
+TEST_CASE("lanes.embedding.with_custom_allocator")
 {
    static constexpr auto logPrint = +[](lua_State* L) {
        lua_getglobal(L, "ID"); // ID
@@ -218,7 +220,7 @@ TEST_CASE("lanes.embedding.with custom allocator")
    static constexpr auto launch_lane = +[](lua_CFunction on_state_create_, int id_, int n_) {
        char script[500];
-        lua_State* L = lua_newstate(local::allocf, nullptr);
+        lua_State* L = luaW_newstate(local::allocf, nullptr, luaL_makeseed(nullptr));
        // _G.ID = id_
        luaL_openlibs(L);
        luaL_dostring(L, "lanes = require 'lanes'");
@@ -264,4 +266,6 @@ TEST_CASE("lanes.embedding.with custom allocator")
    lua_close(L3);
    lua_close(L2);
    lua_close(L1);
-}
-\ No newline at end of file
+}
+#endif // windows.h
diff --git a/unit_tests/init_and_shutdown.cpp b/unit_tests/init_and_shutdown.cpp
index b8174fd..69e4f1b 100644
--- a/unit_tests/init_and_shutdown.cpp
+++ b/unit_tests/init_and_shutdown.cpp
@@ -3,7 +3,7 @@
 // #################################################################################################
-TEST_CASE("lanes.require 'lanes'")
+TEST_CASE("Lua.require_lanes")
 {
    LuaState L{ LuaState::WithBaseLibs{ false }, LuaState::WithFixture{ false } };
@@ -58,7 +58,7 @@ TEST_CASE("lanes.require 'lanes'")
 // #################################################################################################
 // allocator should be "protected", a C function returning a suitable userdata, or nil
-TEST_CASE("lanes.configure.allocator")
+TEST_CASE("lanes.configure.allocator/bool_number_table_string")
 {
    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
@@ -90,49 +90,33 @@ TEST_CASE("lanes.configure.allocator")
    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = <Lua function>")
-    {
-        L.requireFailure("require 'lanes'.configure{allocator = function() return {}, 12, 'yoy' end}");
-    }
-    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = <bad C function>")
-    {
-        // a C function that doesn't return what we expect should cause an error too
-        // TODO: for some reason, we use os.getenv here because using 'print' as the culprit, the tests deadlock in Release builds
-        L.requireFailure("return type(require 'lanes'.configure{allocator = os.getenv})");
-    }
-    // ---------------------------------------------------------------------------------------------
    SECTION("allocator = <string with a typo>")
    {
        // oops, a typo
        L.requireFailure("require 'lanes'.configure{allocator = 'Protected'}");
    }
+}
+// #################################################################################################
+TEST_CASE("lanes.configure.allocator/bad_functions")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = 'protected'")
+    SECTION("allocator = <Lua function>")
    {
-        // no typo, should work
+        L.requireFailure("require 'lanes'.configure{allocator = function() return {}, 12, 'yoy' end}");
-        L.requireSuccess("require 'lanes'.configure{allocator = 'protected'}");
    }
    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = <good custom C allocator>")
+    SECTION("allocator = <bad C function>")
    {
-        // a function that provides what we expect is fine
+        // a C function that doesn't return what we expect should cause an error too
-        static constexpr lua_CFunction _provideAllocator = +[](lua_State* const L_) {
+        // TODO: for some reason, we use os.getenv here because using 'print' as the culprit, the tests deadlock in Release builds
-            lanes::AllocatorDefinition* const _def{ new (L_) lanes::AllocatorDefinition{} };
+        L.requireFailure("return type(require 'lanes'.configure{allocator = os.getenv})");
-            _def->initFrom(L_);
-            return 1;
-        };
-        lua_pushcfunction(L, _provideAllocator);
-        lua_setglobal(L, "ProvideAllocator");
-        L.requireSuccess("require 'lanes'.configure{allocator = ProvideAllocator}");
    }
    // ---------------------------------------------------------------------------------------------
@@ -191,6 +175,39 @@ TEST_CASE("lanes.configure.allocator")
 // #################################################################################################
+TEST_CASE("lanes.configure.allocator/good_function")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    SECTION("allocator = <good custom C allocator>")
+    {
+        // a function that provides what we expect is fine
+        static constexpr lua_CFunction _provideAllocator = +[](lua_State* const L_) {
+            lanes::AllocatorDefinition* const _def{ new (L_) lanes::AllocatorDefinition{} };
+            _def->initFrom(L_);
+            return 1;
+        };
+        lua_pushcfunction(L, _provideAllocator);
+        lua_setglobal(L, "ProvideAllocator");
+        L.requireSuccess("require 'lanes'.configure{allocator = ProvideAllocator}");
+    }
+}
+// #################################################################################################
+// TODO: investigate why this test crashes under AppVerifier on lanes_core.dll unload when running against Lua 5.1, 5.2 and 5.4 RELEASE ONLY!
+// apparently, the mutex of ProtectedAllocator is deemed still in use. Crash goes away if I don't use it in protected_lua_Alloc
+TEST_CASE(("lanes.configure.allocator/protected"))
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    // no typo, should work
+    L.requireSuccess("require 'lanes'.configure{allocator = 'protected'}");
+}
+// #################################################################################################
 TEST_CASE("lanes.configure.internal_allocator")
 {
    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
@@ -289,388 +306,467 @@ TEST_CASE("lanes.configure.keepers_gc_threshold")
 // #################################################################################################
-TEST_CASE("lanes.configure.the rest")
+TEST_CASE("lanes.configure.linda_wake_period")
 {
    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    // linda_wake_period should be a number > 0, or 'never'
+    SECTION("linda_wake_period = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{linda_wake_period = {}}");
+    }
    // ---------------------------------------------------------------------------------------------
-    // nb_user_keepers should be a number in [0, 100]
-    SECTION("nb_user_keepers")
+    SECTION("linda_wake_period = <string>")
    {
-        SECTION("nb_user_keepers = <table>")
+        L.requireFailure("require 'lanes'.configure{linda_wake_period = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{nb_user_keepers = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("nb_user_keepers = <string>")
+    SECTION("linda_wake_period = 'never'")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{nb_user_keepers = 'gluh'}");
+        L.requireSuccess("require 'lanes'.configure{linda_wake_period = 'never'}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("nb_user_keepers = -1")
+    SECTION("linda_wake_period = <negative number>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{nb_user_keepers = -1}");
+        L.requireFailure("require 'lanes'.configure{linda_wake_period = -0.001}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("nb_user_keepers = 0")
+    SECTION("linda_wake_period = 0")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{nb_user_keepers = 0}");
+        L.requireFailure("require 'lanes'.configure{linda_wake_period = 0}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("nb_user_keepers = 100")
+    SECTION("linda_wake_period = 0.0001s")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{nb_user_keepers = 100}");
+        L.requireSuccess("require 'lanes'.configure{linda_wake_period = 0.0001}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("nb_user_keepers = 101")
+    SECTION("linda_wake_period = 1e30")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{nb_user_keepers = 101}");
+        L.requireSuccess("require 'lanes'.configure{linda_wake_period = 1e30}");
-        }
+    }
+}
+// #################################################################################################
+TEST_CASE("lanes.configure.nb_user_keepers")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    // nb_user_keepers should be a number in [0, 100]
+    SECTION("nb_user_keepers = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{nb_user_keepers = {}}");
    }
    // ---------------------------------------------------------------------------------------------
-    // on_state_create should be a function, either C or Lua, without upvalues
-    SECTION("on_state_create")
+    SECTION("nb_user_keepers = <string>")
    {
-        SECTION("on_state_create = <table>")
+        L.requireFailure("require 'lanes'.configure{nb_user_keepers = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{on_state_create = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("on_state_create = <string>")
+    SECTION("nb_user_keepers = -1")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{on_state_create = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{nb_user_keepers = -1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("on_state_create = <number>")
+    SECTION("nb_user_keepers = 0")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{on_state_create = 1}");
+        L.requireSuccess("require 'lanes'.configure{nb_user_keepers = 0}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("on_state_create = false")
+    SECTION("nb_user_keepers = 1")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{on_state_create = false}");
+        L.requireSuccess("require 'lanes'.configure{nb_user_keepers = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("on_state_create = true")
+    SECTION("nb_user_keepers = 100")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{on_state_create = true}");
+        L.requireSuccess("require 'lanes'.configure{nb_user_keepers = 100}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("on_state_create = <Lua function>")
+    SECTION("nb_user_keepers = 101")
-        {
+    {
-            // on_state_create isn't called inside a Keeper state if it's a Lua function (which is good as print() doesn't exist there!)
+        L.requireFailure("require 'lanes'.configure{nb_user_keepers = 101}");
-            L.requireSuccess("local print = print; require 'lanes'.configure{on_state_create = function() print 'hello' end}");
+    }
-        }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION("on_state_create = <C function>")
+TEST_CASE("lanes.configure.on_state_create/configuration")
-        {
+{
-            // funnily enough, in Lua 5.3, print() uses global tostring(), that doesn't exist in a keeper since we didn't open libs -> "attempt to call a nil value"
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
-            // conclusion, don't use print() as a fake on_state_create() callback!
-            // assert() should be fine since we pass a non-false argument to on_state_create
+    // on_state_create should be a function, either C or Lua, without upvalues
-            L.requireSuccess("require 'lanes'.configure{on_state_create = assert}");
-        }
+    SECTION("on_state_create = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{on_state_create = {}}");
    }
    // ---------------------------------------------------------------------------------------------
-    // shutdown_timeout should be a number in [0,3600]
-    SECTION("shutdown_timeout")
+    SECTION("on_state_create = <string>")
    {
-        SECTION("shutdown_timeout = <table>")
+        L.requireFailure("require 'lanes'.configure{on_state_create = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{shutdown_timeout = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("shutdown_timeout = <string>")
+    SECTION("on_state_create = <number>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{shutdown_timeout = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{on_state_create = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("shutdown_timeout = <negative number>")
+    SECTION("on_state_create = false")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{shutdown_timeout = -0.001}");
+        L.requireFailure("require 'lanes'.configure{on_state_create = false}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("shutdown_timeout = 0")
+    SECTION("on_state_create = true")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{shutdown_timeout = 0}");
+        L.requireFailure("require 'lanes'.configure{on_state_create = true}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("shutdown_timeout = 1s")
+    SECTION("on_state_create = <Lua function>")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{shutdown_timeout = 1}");
+        // on_state_create isn't called inside a Keeper state if it's a Lua function (which is good as print() doesn't exist there!)
-        }
+        L.requireSuccess("local print = print; require 'lanes'.configure{on_state_create = function() print 'hello' end}");
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("shutdown_timeout = 3600s")
+    SECTION("on_state_create = <C function>")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{shutdown_timeout = 3600}");
+        // funnily enough, in Lua 5.3, print() uses global tostring(), that doesn't exist in a keeper since we didn't open libs -> "attempt to call a nil value"
-        }
+        // conclusion, don't use print() as a fake on_state_create() callback!
+        // assert() should be fine since we pass a non-false argument to on_state_create
+        L.requireSuccess("require 'lanes'.configure{on_state_create = assert}");
+    }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION("shutdown_timeout = <too long>")
+TEST_CASE("lanes.configure.shutdown_timeout")
-        {
+{
-            L.requireFailure("require 'lanes'.configure{shutdown_timeout = 3600.001}");
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
-        }
+    // shutdown_timeout should be a number in [0,3600]
+    SECTION("shutdown_timeout = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{shutdown_timeout = {}}");
    }
    // ---------------------------------------------------------------------------------------------
-    // strip_functions should be a boolean
-    SECTION("strip_functions")
+    SECTION("shutdown_timeout = <string>")
    {
-        SECTION("strip_functions = <table>")
+        L.requireFailure("require 'lanes'.configure{shutdown_timeout = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{strip_functions = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("strip_functions = <string>")
+    SECTION("shutdown_timeout = <negative number>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{strip_functions = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{shutdown_timeout = -0.001}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("strip_functions = <number>")
+    SECTION("shutdown_timeout = 0")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{strip_functions = 1}");
+        L.requireSuccess("require 'lanes'.configure{shutdown_timeout = 0}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("strip_functions = <C function>")
+    SECTION("shutdown_timeout = 1s")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{strip_functions = print}");
+        L.requireSuccess("require 'lanes'.configure{shutdown_timeout = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("strip_functions = false")
+    SECTION("shutdown_timeout = 3600s")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{strip_functions = false}");
+        L.requireSuccess("require 'lanes'.configure{shutdown_timeout = 3600}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("strip_functions = true")
+    SECTION("shutdown_timeout = <too long>")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{strip_functions = true}");
+        L.requireFailure("require 'lanes'.configure{shutdown_timeout = 3600.001}");
-        }
+    }
+}
+// #################################################################################################
+TEST_CASE("lanes.configure.strip_functions")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    // strip_functions should be a boolean
+    SECTION("strip_functions = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{strip_functions = {}}");
    }
    // ---------------------------------------------------------------------------------------------
-    // track_lanes should be a boolean
-    SECTION("track_lanes")
+    SECTION("strip_functions = <string>")
    {
-        SECTION("track_lanes = <table>")
+        L.requireFailure("require 'lanes'.configure{strip_functions = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{track_lanes = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("track_lanes = <string>")
+    SECTION("strip_functions = <number>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{track_lanes = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{strip_functions = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("track_lanes = <number>")
+    SECTION("strip_functions = <C function>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{track_lanes = 1}");
+        L.requireFailure("require 'lanes'.configure{strip_functions = print}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("track_lanes = <C function>")
+    SECTION("strip_functions = false")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{track_lanes = print}");
+        L.requireSuccess("require 'lanes'.configure{strip_functions = false}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("track_lanes = false")
+    SECTION("strip_functions = true")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{track_lanes = false}");
+        L.requireSuccess("require 'lanes'.configure{strip_functions = true}");
-        }
+    }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION("track_lanes = true")
+TEST_CASE("lanes.configure.track_lanes")
-        {
+{
-            L.requireSuccess("require 'lanes'.configure{track_lanes = true}");
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
-        }
+    // track_lanes should be a boolean
+    SECTION("track_lanes = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{track_lanes = {}}");
    }
    // ---------------------------------------------------------------------------------------------
-    // verbose_errors should be a boolean
-    SECTION("verbose_errors")
+    SECTION("track_lanes = <string>")
    {
-        SECTION("verbose_errors = <table>")
+        L.requireFailure("require 'lanes'.configure{track_lanes = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{verbose_errors = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("verbose_errors = <string>")
+    SECTION("track_lanes = <number>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{verbose_errors = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{track_lanes = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("verbose_errors = <number>")
+    SECTION("track_lanes = <C function>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{verbose_errors = 1}");
+        L.requireFailure("require 'lanes'.configure{track_lanes = print}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("verbose_errors = <C function>")
+    SECTION("track_lanes = false")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{verbose_errors = print}");
+        L.requireSuccess("require 'lanes'.configure{track_lanes = false}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("verbose_errors = false")
+    SECTION("track_lanes = true")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{verbose_errors = false}");
+        L.requireSuccess("require 'lanes'.configure{track_lanes = true}");
-        }
+    }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION("verbose_errors = true")
+TEST_CASE("lanes.configure.verbose_errors")
-        {
+{
-            L.requireSuccess("require 'lanes'.configure{verbose_errors = true}");
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
-        }
+    // verbose_errors should be a boolean
+    SECTION("verbose_errors = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{verbose_errors = {}}");
    }
    // ---------------------------------------------------------------------------------------------
-    // with_timers should be a boolean
-    SECTION("with_timers")
+    SECTION("verbose_errors = <string>")
    {
-        SECTION("with_timers = <table>")
+        L.requireFailure("require 'lanes'.configure{verbose_errors = 'gluh'}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{with_timers = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("with_timers = <string>")
+    SECTION("verbose_errors = <number>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{with_timers = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{verbose_errors = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("with_timers = <number>")
+    SECTION("verbose_errors = <C function>")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{with_timers = 1}");
+        L.requireFailure("require 'lanes'.configure{verbose_errors = print}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("with_timers = <C function>")
+    SECTION("verbose_errors = false")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{with_timers = print}");
+        L.requireSuccess("require 'lanes'.configure{verbose_errors = false}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("with_timers = false")
+    SECTION("verbose_errors = true")
-        {
+    {
-            L.requireSuccess("require 'lanes'.configure{with_timers = false}");
+        L.requireSuccess("require 'lanes'.configure{verbose_errors = true}");
-        }
+    }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION("with_timers = true")
+TEST_CASE("lanes.configure.with_timers")
-        {
+{
-            L.requireSuccess("require 'lanes'.configure{with_timers = true}");
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
-        }
+    // with_timers should be a boolean
+    SECTION("with_timers = <table>")
+    {
+        L.requireFailure("require 'lanes'.configure{with_timers = {}}");
+    }
+    // ---------------------------------------------------------------------------------------------
+    SECTION("with_timers = <string>")
+    {
+        L.requireFailure("require 'lanes'.configure{with_timers = 'gluh'}");
    }
    // ---------------------------------------------------------------------------------------------
+    SECTION("with_timers = <number>")
+    {
+        L.requireFailure("require 'lanes'.configure{with_timers = 1}");
+    }
+    // ---------------------------------------------------------------------------------------------
+    SECTION("with_timers = <C function>")
+    {
+        L.requireFailure("require 'lanes'.configure{with_timers = print}");
+    }
+    // ---------------------------------------------------------------------------------------------
+    SECTION("with_timers = false")
+    {
+        L.requireSuccess("require 'lanes'.configure{with_timers = false}");
+    }
+    // ---------------------------------------------------------------------------------------------
+    SECTION("with_timers = true")
+    {
+        L.requireSuccess("require 'lanes'.configure{with_timers = true}");
+    }
+}
+// #################################################################################################
+TEST_CASE("lanes.configure.unknown_setting")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // any unknown setting should be rejected
-    SECTION("unknown_setting")
+    SECTION("table setting")
    {
-        SECTION("table setting")
+        L.requireFailure("require 'lanes'.configure{[{}] = {}}");
-        {
+    }
-            L.requireFailure("require 'lanes'.configure{[{}] = {}}");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("boolean setting")
+    SECTION("boolean setting")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{[true] = 'gluh'}");
+        L.requireFailure("require 'lanes'.configure{[true] = 'gluh'}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("function setting")
+    SECTION("function setting")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{[function() end] = 1}");
+        L.requireFailure("require 'lanes'.configure{[function() end] = 1}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("number setting")
+    SECTION("number setting")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{[1] = function() end}");
+        L.requireFailure("require 'lanes'.configure{[1] = function() end}");
-        }
+    }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("unknown string setting")
+    SECTION("unknown string setting")
-        {
+    {
-            L.requireFailure("require 'lanes'.configure{['gluh'] = false}");
+        L.requireFailure("require 'lanes'.configure{['gluh'] = false}");
-        }
    }
 }
@@ -679,7 +775,7 @@ TEST_CASE("lanes.configure.the rest")
 #if LUAJIT_FLAVOR() == 0
 // TODO: this test crashes inside S.close() against LuaJIT. to be investigated
-TEST_CASE("lanes.finally.no fixture")
+TEST_CASE("lanes.finally.no_fixture")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // we need Lanes to be up. Since we run several 'scripts', we store it as a global
@@ -700,7 +796,7 @@ TEST_CASE("lanes.finally.no fixture")
 // #################################################################################################
-TEST_CASE("lanes.finally.with fixture")
+TEST_CASE("lanes.finally.with_fixture")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
@@ -718,7 +814,7 @@ TEST_CASE("lanes.finally.with fixture")
 // #################################################################################################
-TEST_CASE("lanes.finally.shutdown with an uncooperative lane")
+TEST_CASE("lanes.finally.shutdown_with_an_uncooperative_lane")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
    S.requireSuccess("lanes = require 'lanes'.configure()");
@@ -767,7 +863,7 @@ namespace
 // #################################################################################################
-TEST_CASE("lanes.on_state_create setting")
+TEST_CASE("lanes.configure.on_state_create/details")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp
index d6ef2e0..b6fb188 100644
--- a/unit_tests/lane_tests.cpp
+++ b/unit_tests/lane_tests.cpp
@@ -1,5 +1,7 @@
 #include "_pch.hpp"
 #include "shared.h"
+#include "lanes/src/threading.hpp"
 // #################################################################################################
 // #################################################################################################
@@ -33,7 +35,77 @@ TEST_CASE("lanes.nameof")
 // #################################################################################################
 // #################################################################################################
-TEST_CASE("lanes.sleep.argument validation")
+TEST_CASE("lanes.thread_priority_range")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    S.requireSuccess("a, b = lanes.thread_priority_range(); print(a, b)");
+    S.requireSuccess("assert(type(a) == 'number' and type(b) == 'number' and b > a)");
+    S.requireSuccess("c, d = lanes.thread_priority_range('native'); print(c, d)");
+    S.requireSuccess("assert(type(c) == 'number' and type(d) == 'number' and d > c)");
+    // can't really test the range of values from pthread as they are platform-dependent
+    if constexpr (THREADAPI == THREADAPI_WINDOWS) {
+        // windows constants THREAD_PRIORITY_IDLE and THREAD_PRIORITY_TIME_CRITICAL
+        S.requireSuccess("assert(c == -15 and d == 15)");
+    }
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.set_thread_priority")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    SECTION("mapped priorities")
+    {
+        std::string_view const _script{
+            " min_prio, max_prio = lanes.thread_priority_range()"
+            " for prio = min_prio, max_prio do"
+            "     lanes.set_thread_priority(prio)"
+            " end"
+        };
+        S.requireSuccess(_script);
+        S.requireFailure("lanes.set_thread_priority(min_prio - 1)");
+        S.requireFailure("lanes.set_thread_priority(max_prio + 1)");
+    }
+    SECTION("native priorities")
+    {
+        S.requireSuccess("min_prio, max_prio = lanes.thread_priority_range('native')");
+        if constexpr (THREADAPI == THREADAPI_WINDOWS) {
+            // Win32 range is -15 to 15, but only some values are accepted
+            S.requireSuccess("lanes.set_thread_priority(-15, 'native')"); // THREAD_PRIORITY_IDLE
+            S.requireFailure("lanes.set_thread_priority(-3, 'native')");
+            S.requireSuccess("lanes.set_thread_priority(-2, 'native')"); // THREAD_PRIORITY_LOWEST
+            S.requireSuccess("lanes.set_thread_priority(-1, 'native')"); // THREAD_PRIORITY_BELOW_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(0, 'native')"); // THREAD_PRIORITY_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(1, 'native')"); // THREAD_PRIORITY_ABOVE_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(2, 'native')"); // THREAD_PRIORITY_HIGHEST
+            S.requireFailure("lanes.set_thread_priority(3, 'native')");
+            S.requireSuccess("lanes.set_thread_priority(-15, 'native')"); // THREAD_PRIORITY_TIME_CRITICAL
+        } else {
+            // until proven otherwise, the full set of values is supported by pthread
+            std::string_view const _script{
+                " for prio = min_prio, max_prio do"
+                "     lanes.set_thread_priority(prio, 'native')"
+                " end"
+            };
+            S.requireSuccess(_script);
+        }
+        S.requireFailure("lanes.set_thread_priority(min_prio - 1)");
+        S.requireFailure("lanes.set_thread_priority(max_prio + 1)");
+    }
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.sleep.argument_validation/not_numbers")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    S.requireSuccess("lanes = require 'lanes'.configure()");
@@ -44,6 +116,14 @@ TEST_CASE("lanes.sleep.argument validation")
    S.requireFailure("lanes.sleep('a string')");
    S.requireFailure("lanes.sleep(lanes.null)");
    S.requireFailure("lanes.sleep(print)");
+}
+// #################################################################################################
+TEST_CASE("lanes.sleep.argument_validation/numbers")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
    // negative durations are not supported
    S.requireFailure("lanes.sleep(-1)");
@@ -97,88 +177,109 @@ TEST_CASE("lanes.sleep.interactions with timers")
 // #################################################################################################
 // #################################################################################################
-TEST_CASE("lanes.gen")
+TEST_CASE("lanes.gen.argument_checks")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    S.requireSuccess("lanes = require 'lanes'.configure()");
    // ---------------------------------------------------------------------------------------------
-    SECTION("argument checks")
+    // no argument is bad
-    {
+    S.requireFailure("lanes.gen()");
-        // no parameter is bad
-        S.requireFailure("lanes.gen()");
+    // minimal generator needs a function
+    S.requireSuccess("lanes.gen(function() end)");
-        // minimal generator needs a function
-        S.requireSuccess("lanes.gen(function() end)");
+    // acceptable arguments for the generator are strings, tables, nil, followed by the function body
+    S.requireSuccess("lanes.gen(nil, function() end)");
-        // acceptable parameters for the generator are strings, tables, nil, followed by the function body
+    S.requireSuccess("lanes.gen('', function() end)");
-        S.requireSuccess("lanes.gen(nil, function() end)");
+    S.requireSuccess("lanes.gen({}, function() end)");
-        S.requireSuccess("lanes.gen('', function() end)");
+    S.requireSuccess("lanes.gen('', {}, function() end)");
-        S.requireSuccess("lanes.gen({}, function() end)");
+    S.requireSuccess("lanes.gen({}, '', function() end)");
-        S.requireSuccess("lanes.gen('', {}, function() end)");
+    S.requireSuccess("lanes.gen('', '', function() end)");
-        S.requireSuccess("lanes.gen({}, '', function() end)");
+    S.requireSuccess("lanes.gen({}, {}, function() end)");
-        S.requireSuccess("lanes.gen('', '', function() end)");
-        S.requireSuccess("lanes.gen({}, {}, function() end)");
+    // anything different should fail: booleans, numbers, any userdata
+    S.requireFailure("lanes.gen(false, function() end)");
-        // anything different should fail: booleans, numbers, any userdata
+    S.requireFailure("lanes.gen(true, function() end)");
-        S.requireFailure("lanes.gen(false, function() end)");
+    S.requireFailure("lanes.gen(42, function() end)");
-        S.requireFailure("lanes.gen(true, function() end)");
+    S.requireFailure("lanes.gen(io.stdin, function() end)");
-        S.requireFailure("lanes.gen(42, function() end)");
+    S.requireFailure("lanes.gen(lanes.linda(), function() end)");
-        S.requireFailure("lanes.gen(io.stdin, function() end)");
+    S.requireFailure("lanes.gen(lanes.linda():deep(), function() end)");
-        S.requireFailure("lanes.gen(lanes.linda(), function() end)");
-        S.requireFailure("lanes.gen(lanes.linda():deep(), function() end)");
+    // even if argument types are correct, the function must come last
+    S.requireFailure("lanes.gen(function() end, '')");
-        // even if parameter types are correct, the function must come last
-        S.requireFailure("lanes.gen(function() end, '')");
+    // the strings should only list "known base libraries", in any order, or "*"
+    // if the particular Lua flavor we build for doesn't support them, they raise an error unless postfixed by '?'
-        // the strings should only list "known base libraries", in any order, or "*"
+    S.requireSuccess("lanes.gen('base', function() end)");
-        // if the particular Lua flavor we build for doesn't support them, they raise an error unless postfixed by '?'
-        S.requireSuccess("lanes.gen('base', function() end)");
+    // bit, ffi, jit are LuaJIT-specific
-        // bit, ffi, jit are LuaJIT-specific
 #if LUAJIT_FLAVOR() == 0
-        S.requireFailure("lanes.gen('bit,ffi,jit', function() end)");
+    S.requireFailure("lanes.gen('bit,ffi,jit', function() end)");
-        S.requireSuccess("lanes.gen('bit?,ffi?,jit?', function() end)");
+    S.requireSuccess("lanes.gen('bit?,ffi?,jit?', function() end)");
 #endif // LUAJIT_FLAVOR()
-        // bit32 library existed only in Lua 5.2, there is still a loader that will raise an error in Lua 5.3
+    // bit32 library existed only in Lua 5.2, there is still a loader that will raise an error in Lua 5.3
 #if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        S.requireSuccess("lanes.gen('bit32', function() end)");
+    S.requireSuccess("lanes.gen('bit32', function() end)");
 #else // LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        S.requireFailure("lanes.gen('bit32', function() end)");
+    S.requireFailure("lanes.gen('bit32', function() end)");
-        S.requireSuccess("lanes.gen('bit32?', function() end)");
+    S.requireSuccess("lanes.gen('bit32?', function() end)");
 #endif // LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        // coroutine library appeared with Lua 5.2
+    // coroutine library appeared with Lua 5.2
 #if LUA_VERSION_NUM == 501
-        S.requireFailure("lanes.gen('coroutine', function() end)");
+    S.requireFailure("lanes.gen('coroutine', function() end)");
-        S.requireSuccess("lanes.gen('coroutine?', function() end)");
+    S.requireSuccess("lanes.gen('coroutine?', function() end)");
 #endif // LUA_VERSION_NUM == 501
-        S.requireSuccess("lanes.gen('debug', function() end)");
+    S.requireSuccess("lanes.gen('debug', function() end)");
-        S.requireSuccess("lanes.gen('io', function() end)");
+    S.requireSuccess("lanes.gen('io', function() end)");
-        S.requireSuccess("lanes.gen('math', function() end)");
+    S.requireSuccess("lanes.gen('math', function() end)");
-        S.requireSuccess("lanes.gen('os', function() end)");
+    S.requireSuccess("lanes.gen('os', function() end)");
-        S.requireSuccess("lanes.gen('package', function() end)");
+    S.requireSuccess("lanes.gen('package', function() end)");
-        S.requireSuccess("lanes.gen('string', function() end)");
+    S.requireSuccess("lanes.gen('string', function() end)");
-        S.requireSuccess("lanes.gen('table', function() end)");
+    S.requireSuccess("lanes.gen('table', function() end)");
-        // utf8 library appeared with Lua 5.3
+    // utf8 library appeared with Lua 5.3
 #if LUA_VERSION_NUM < 503
-        S.requireFailure("lanes.gen('utf8', function() end)");
+    S.requireFailure("lanes.gen('utf8', function() end)");
-        S.requireSuccess("lanes.gen('utf8?', function() end)");
+    S.requireSuccess("lanes.gen('utf8?', function() end)");
 #endif // LUA_VERSION_NUM < 503
-        S.requireSuccess("lanes.gen('lanes_core', function() end)");
+    S.requireSuccess("lanes.gen('lanes_core', function() end)");
-        // "*" repeated or combined with anything else is forbidden
+    // "*" repeated or combined with anything else is forbidden
-        S.requireFailure("lanes.gen('*', '*', function() end)");
+    S.requireFailure("lanes.gen('*', '*', function() end)");
-        S.requireFailure("lanes.gen('base', '*', function() end)");
+    S.requireFailure("lanes.gen('base', '*', function() end)");
-        // unknown names are forbidden
+    // unknown names are forbidden
-        S.requireFailure("lanes.gen('Base', function() end)");
+    S.requireFailure("lanes.gen('Base', function() end)");
-        // repeating the same library more than once is forbidden
+    // repeating the same library more than once is forbidden
-        S.requireFailure("lanes.gen('base,base', function() end)");
+    S.requireFailure("lanes.gen('base,base', function() end)");
-    }
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.gen.priority")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    S.requireSuccess("lanes.gen({priority=1}, function() end)");
+    // AFAICT, 1 is accepted by all pthread flavors and win32 API
+    S.requireSuccess("lanes.gen({native_priority=1}, function() end)");
+    // shouldn't be able to provide 2 priority settings
+    S.requireFailure("lanes.gen({priority=1, native_priority=1}, function() end)");
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.gen.thread_naming")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
    // ---------------------------------------------------------------------------------------------
@@ -319,19 +420,24 @@ TEST_CASE("lane.cancel")
 // unfortunately, VS Test adapter does not list individual sections,
 // so let's create a separate test case for each file with an ugly macro...
-#define MAKE_TEST_CASE(DIR, FILE, CONDITION)\
+#define MAKE_TEST_CASE(DIR, FILE, CONDITION) \
-TEST_CASE("scripted tests." #DIR "." #FILE) \
+TEST_CASE("scripted_tests." #DIR "." #FILE) \
 { \
    FileRunner _runner(R"(.\unit_tests\scripts)"); \
    _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \
 }
-MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
+#if LUA_VERSION_NUM >= 504 // this makes use of to-be-closed variables, a Lua 5.4 feature
-#if LUA_VERSION_NUM >= 504 // // warnings are a Lua 5.4 feature
+#define MAKE_TEST_CASE_54(DIR, FILE, CONDITION) MAKE_TEST_CASE(DIR, FILE, CONDITION)
-// NOTE: when this test ends, there are resource leaks and a dangling thread
+#else // LUA_VERSION_NUM
-MAKE_TEST_CASE(lane, uncooperative_shutdown, AssertWarns)
+#define MAKE_TEST_CASE_54(DIR, FILE, CONDITION)
 #endif // LUA_VERSION_NUM
+MAKE_TEST_CASE(lane, body_is_a_c_function, AssertNoLuaError)
+MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
+MAKE_TEST_CASE_54(lane, uncooperative_shutdown, AssertWarns) // NOTE: when this test ends, there are resource leaks and a dangling thread
 MAKE_TEST_CASE(lane, tasking_basic, AssertNoLuaError)
+MAKE_TEST_CASE(lane, tasking_cancelling_with_hook, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_cancelling, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_comms_criss_cross, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_communications, AssertNoLuaError)
@@ -339,19 +445,27 @@ MAKE_TEST_CASE(lane, tasking_error, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_join_test, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_send_receive_code, AssertNoLuaError)
 MAKE_TEST_CASE(lane, stdlib_naming, AssertNoLuaError)
-MAKE_TEST_CASE(coro, basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, cancelling_suspended, AssertNoLuaError)
+MAKE_TEST_CASE_54(coro, collect_yielded_lane, AssertNoLuaError)
 #if LUAJIT_FLAVOR() == 0
 // TODO: for some reason, the test fails with LuaJIT. To be investigated
 MAKE_TEST_CASE(coro, error_handling, AssertNoLuaError)
 #endif // LUAJIT_FLAVOR()
+MAKE_TEST_CASE(coro, index_suspended, AssertNoLuaError)
+MAKE_TEST_CASE(coro, join_suspended, AssertNoLuaError)
+MAKE_TEST_CASE_54(coro, linda_in_close_handler, AssertNoLuaError)
+MAKE_TEST_CASE(coro, regular_function, AssertNoLuaError)
+MAKE_TEST_CASE(coro, resume_basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, yielding_in_non_coro_errors, AssertNoLuaError)
 /*
-TEST_CASE("lanes.scripted tests")
+TEST_CASE("lanes.scripted_tests")
 {
    auto const& _testParam = GENERATE(
        FileRunnerParam{ PUC_LUA_ONLY("lane/cooperative_shutdown"), TestType::AssertNoLuaError }, // 0
        FileRunnerParam{ "lane/uncooperative_shutdown", TestType::AssertWarns },
        FileRunnerParam{ "lane/tasking_basic", TestType::AssertNoLuaError }, // 2
+        FileRunnerParam{ "lane/tasking_cancelling_with_hook", TestType::AssertNoLuaError }, // 3
        FileRunnerParam{ "lane/tasking_cancelling", TestType::AssertNoLuaError }, // 3
        FileRunnerParam{ "lane/tasking_comms_criss_cross", TestType::AssertNoLuaError }, // 4
        FileRunnerParam{ "lane/tasking_communications", TestType::AssertNoLuaError },
diff --git a/unit_tests/legacy_tests.cpp b/unit_tests/legacy_tests.cpp
index 7f2f31d..84581d2 100644
--- a/unit_tests/legacy_tests.cpp
+++ b/unit_tests/legacy_tests.cpp
@@ -11,7 +11,7 @@
 // so let's create a separate test case for each file with an ugly macro...
 #define MAKE_TEST_CASE(FILE) \
-TEST_CASE("scripted tests.legacy." #FILE) \
+TEST_CASE("scripted_tests.legacy." #FILE) \
 { \
    FileRunner _runner(R"(.\tests\)"); \
    _runner.performTest(FileRunnerParam{ #FILE, TestType::AssertNoLuaError }); \
@@ -49,7 +49,7 @@ MAKE_TEST_CASE(tobeclosed)
 MAKE_TEST_CASE(track_lanes)
 /*
-TEST_CASE("lanes.legacy scripted tests")
+TEST_CASE("lanes.legacy_scripted_tests")
 {
    auto const& _testParam = GENERATE(
          FileRunnerParam{ "appendud", TestType::AssertNoLuaError } // 0
diff --git a/unit_tests/linda_tests.cpp b/unit_tests/linda_tests.cpp
index efdb8a5..90630a7 100644
--- a/unit_tests/linda_tests.cpp
+++ b/unit_tests/linda_tests.cpp
@@ -3,154 +3,216 @@
 // #################################################################################################
-TEST_CASE("linda.single Keeper")
+TEST_CASE("linda.single_keeper.creation/no_argument")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
    S.requireSuccess("lanes = require 'lanes'");
-    SECTION("Linda creation")
+    // no argument is ok
-    {
+    S.requireSuccess("lanes.linda()");
-        // no parameters is ok
+    S.requireNotReturnedString("return tostring(lanes.linda())", R"===(Linda: <not a string>)==="); // unspecified name should not result in <not a string>
-        S.requireSuccess("lanes.linda()");
+}
-        S.requireNotReturnedString("return tostring(lanes.linda())", R"===(Linda: <not a string>)==="); // unspecified name should not result in <not a string>
-        // since we have only one keeper, only group 0 is authorized
-        S.requireFailure("lanes.linda(-1)");
-        S.requireSuccess("lanes.linda(0)");
-        S.requireFailure("lanes.linda(1)");
-        // any name is ok
-        S.requireSuccess("lanes.linda('')"); // an empty name results in a string conversion of the form "Linda: <some hex value>" that we can't test (but it works)
-        S.requireReturnedString("return tostring(lanes.linda('short name'))", R"===(Linda: short name)===");
-        S.requireReturnedString("return tostring(lanes.linda('very very very very very very long name'))", R"===(Linda: very very very very very very long name)===");
-        S.requireReturnedString("return tostring(lanes.linda('auto'))", R"===(Linda: [string "return tostring(lanes.linda('auto'))"]:1)===");
-        if constexpr (LUA_VERSION_NUM == 504) {
-            // a function is acceptable as a __close handler
-            S.requireSuccess("local l <close> = lanes.linda(function() end)");
-            // a callable table too (a callable full userdata as well, but I have none here)
-            S.requireSuccess("local l <close> = lanes.linda(setmetatable({}, {__call = function() end}))");
-            // if the function raises an error, we should get it
-            S.requireFailure("local l <close> = lanes.linda(function() error 'gluh' end)");
-        } else {
-            // no __close support before Lua 5.4
-            S.requireFailure("lanes.linda(function() end)");
-            S.requireFailure("lanes.linda(setmetatable({}, {__call = function() end}))");
-        }
-        // mixing parameters in any order is ok: 2 out of 3
+// #################################################################################################
-        S.requireSuccess("lanes.linda(0, 'name')");
-        S.requireSuccess("lanes.linda('name', 0)");
-        if constexpr (LUA_VERSION_NUM == 504) {
-            S.requireSuccess("lanes.linda(0, function() end)");
-            S.requireSuccess("lanes.linda(function() end, 0)");
-            S.requireSuccess("lanes.linda('name', function() end)");
-            S.requireSuccess("lanes.linda(function() end, 'name')");
-        }
-        // mixing parameters in any order is ok: 3 out of 3
+TEST_CASE("linda.single_keeper.creation/non_table_arguments")
-        if constexpr (LUA_VERSION_NUM == 504) {
+{
-            S.requireSuccess("lanes.linda(0, 'name', function() end)");
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
-            S.requireSuccess("lanes.linda(0, function() end, 'name')");
+    S.requireSuccess("lanes = require 'lanes'");
-            S.requireSuccess("lanes.linda('name', 0, function() end)");
-            S.requireSuccess("lanes.linda('name', function() end, 0)");
+    // any argument that is not a table is not ok
-            S.requireSuccess("lanes.linda(function() end, 0, 'name')");
+    S.requireFailure("lanes.linda(0)");
-            S.requireSuccess("lanes.linda(function() end, 'name', 0)");
+    S.requireFailure("lanes.linda('bob')");
-        }
+    S.requireFailure("lanes.linda(false)");
+    S.requireFailure("lanes.linda(function() end)");
+    S.requireFailure("lanes.linda(lanes.cancel_error)");
+}
+// #################################################################################################
-        // unsupported parameters should fail
+TEST_CASE("linda.single_keeper.creation/close_handler")
-        S.requireFailure("lanes.linda(true)");
+{
-        S.requireFailure("lanes.linda(false)");
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
-        // uncallable table or full userdata
+    S.requireSuccess("lanes = require 'lanes'");
-        S.requireFailure("lanes.linda({})");
-        S.requireFailure("lanes.linda(lanes.linda())");
+    if constexpr (LUA_VERSION_NUM >= 504) {
+        // a function is acceptable as a __close handler
+        S.requireSuccess("local l <close> = lanes.linda{close_handler = function() end}");
+        // a callable table too (a callable full userdata as well, but I have none here)
+        S.requireSuccess("local l <close> = lanes.linda{close_handler = setmetatable({}, {__call = function() end})}");
+    } else {
+        // no __close support before Lua 5.4, field is ignored (therefore invalid values are accepted too!)
+        S.requireSuccess("lanes.linda{close_handler = 'a string'}");
+        S.requireSuccess("lanes.linda{close_handler = function() end}");
+        S.requireSuccess("lanes.linda{close_handler = setmetatable({}, {__call = function() end})}");
    }
+}
-    // ---------------------------------------------------------------------------------------------
+// #################################################################################################
+TEST_CASE("linda.single_keeper.creation/table_argument")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'");
+    // one table is fine
+    S.requireSuccess("lanes.linda{}");
+    // anything beyond that is not
+    S.requireFailure("lanes.linda({},{})");
+    S.requireFailure("lanes.linda({},'bob')");
+    S.requireFailure("lanes.linda({},42)");
+}
+// #################################################################################################
+TEST_CASE("linda.single_keeper.creation/group")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'");
+    // since we have only one keeper, only group 0 is authorized
+    S.requireFailure("lanes.linda{group = -1}");
+    S.requireSuccess("lanes.linda{group = 0}");
+    S.requireFailure("lanes.linda{group = 1}");
+}
+// #################################################################################################
+TEST_CASE("linda.single_keeper.creation/name")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'");
+    // any name is ok
+    S.requireSuccess("lanes.linda{name = ''}"); // an empty name results in a string conversion of the form "Linda: <some hex value>" that we can't test (but it works)
+    S.requireReturnedString("return tostring(lanes.linda{name = 'short name'})", R"===(Linda: short name)===");
+    S.requireReturnedString("return tostring(lanes.linda{name = 'very very very very very very long name'})", R"===(Linda: very very very very very very long name)===");
+    S.requireReturnedString("return tostring(lanes.linda{name = 'auto'})", R"===(Linda: [string "return tostring(lanes.linda{name = 'auto'})"]:1)===");
+}
+// #################################################################################################
+TEST_CASE("linda.single_keeper.creation/wake_period")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'");
+    // wake_period should be a number > 0
+    S.requireFailure("lanes.linda{wake_period = false}");
+    S.requireFailure("lanes.linda{wake_period = 'bob'}");
+    S.requireFailure("lanes.linda{wake_period = {}}");
+    S.requireFailure("lanes.linda{wake_period = -1}");
+    S.requireFailure("lanes.linda{wake_period = 0}");
+    S.requireSuccess("lanes.linda{wake_period = 0.0001}");
+    S.requireSuccess("lanes.linda{wake_period = 'never'}");
+}
+// #################################################################################################
-    SECTION("Linda indexing")
+TEST_CASE("linda.single_keeper.indexing")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    // indexing the linda with an unknown string key should fail
+    S.requireFailure("return lanes.linda().gouikra");
+    // indexing the linda with an unsupported key type should fail
+    S.requireFailure("return lanes.linda()[5]");
+    S.requireFailure("return lanes.linda()[false]");
+    S.requireFailure("return lanes.linda()[{}]");
+    S.requireFailure("return lanes.linda()[function() end]");
+}
+// #################################################################################################
+TEST_CASE("linda.single_keeper.send()")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+        SECTION("timeout")
    {
-        // indexing the linda with an unknown string key should fail
+        // timeout checks
-        S.requireFailure("return lanes.linda().gouikra");
+        // linda:send() should fail if the timeout is bad
-        // indexing the linda with an unsupported key type should fail
+        S.requireFailure("lanes.linda():send(-1, 'k', 'v')");
-        S.requireFailure("return lanes.linda()[5]");
+        // any positive value is ok
-        S.requireFailure("return lanes.linda()[false]");
+        S.requireSuccess("lanes.linda():send(0, 'k', 'v')");
-        S.requireFailure("return lanes.linda()[{}]");
+        S.requireSuccess("lanes.linda():send(1e20, 'k', 'v')");
-        S.requireFailure("return lanes.linda()[function() end]");
+        // nil too (same as 'forever')
+        S.requireSuccess("lanes.linda():send(nil, 'k', 'v')");
    }
-    // ---------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-    SECTION("linda:send()")
+    SECTION("fails on bad keys")
    {
-        SECTION("timeout")
+        // key checks
-        {
+        // linda:send() should fail if the key is unsupported (nil, table, function, full userdata, reserved light userdata)
-            // timeout checks
+        S.requireFailure("lanes.linda():send(0, nil, 'v')");
-            // linda:send() should fail if the timeout is bad
+        S.requireFailure("lanes.linda():send(0, {}, 'v')");
-            S.requireFailure("lanes.linda():send(-1, 'k', 'v')");
+        S.requireFailure("lanes.linda():send(0, function() end, 'v')");
-            // any positive value is ok
+        S.requireFailure("lanes.linda():send(0, io.stdin, 'v')");
-            S.requireSuccess("lanes.linda():send(0, 'k', 'v')");
+        S.requireFailure("lanes.linda():send(0, lanes.null, 'v')");
-            S.requireSuccess("lanes.linda():send(1e20, 'k', 'v')");
+        S.requireFailure("lanes.linda():send(0, lanes.cancel_error, 'v')");
-            // nil too (same as 'forever')
+    }
-            S.requireSuccess("lanes.linda():send(nil, 'k', 'v')");
-        }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("fails on bad keys")
+    SECTION("succeeds on supported keys")
-        {
+    {
-            // key checks
+        // supported keys are ok: boolean, number, string, light userdata, deep userdata
-            // linda:send() should fail if the key is unsupported (nil, table, function, full userdata, reserved light userdata)
+        S.requireSuccess("lanes.linda():send(0, true, 'v')");
-            S.requireFailure("lanes.linda():send(0, nil, 'v')");
+        S.requireSuccess("lanes.linda():send(0, false, 'v')");
-            S.requireFailure("lanes.linda():send(0, {}, 'v')");
+        S.requireSuccess("lanes.linda():send(0, 99, 'v')");
-            S.requireFailure("lanes.linda():send(0, function() end, 'v')");
+        S.requireSuccess("local l = lanes.linda(); l:send(0, l:deep(), 'v')");
-            S.requireFailure("lanes.linda():send(0, io.stdin, 'v')");
+    }
-            S.requireFailure("lanes.linda():send(0, lanes.null, 'v')");
-            S.requireFailure("lanes.linda():send(0, lanes.cancel_error, 'v')");
-            S.requireFailure("local l = lanes.linda(); l:send(0, l.batched, 'v')");
-        }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("succeeds on supported keys")
+    SECTION("succeeds on deep userdata key")
-        {
+    {
-            // supported keys are ok: boolean, number, string, light userdata, deep userdata
+        S.requireSuccess("local l = lanes.linda(); l:send(0, l, 'v')");
-            S.requireSuccess("lanes.linda():send(0, true, 'v')");
+    }
-            S.requireSuccess("lanes.linda():send(0, false, 'v')");
-            S.requireSuccess("lanes.linda():send(0, 99, 'v')");
-            S.requireSuccess("local l = lanes.linda(); l:send(0, l:deep(), 'v')");
-        }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("succeeds on deep userdata key")
+    SECTION(". fails")
-        {
+    {
-            S.requireSuccess("local l = lanes.linda(); l:send(0, l, 'v')");
+        // misuse checks, . instead of :
-        }
+        S.requireFailure("lanes.linda().send(nil, 'k', 'v')");
+    }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION(". fails")
+    SECTION("unsupported values fail")
-        {
+    {
-            // misuse checks, . instead of :
+        // value checks
-            S.requireFailure("lanes.linda().send(nil, 'k', 'v')");
+        // linda:send() should fail if we don't send anything
-        }
+        S.requireFailure("lanes.linda():send()");
+        S.requireFailure("lanes.linda():send(0)");
+        S.requireFailure("lanes.linda():send(0, 'k')");
+        // or non-deep userdata
+        S.requireFailure("lanes.linda():send(0, 'k', fixture.newuserdata())");
+        // or something with a converter that raises an error (maybe that should go to a dedicated __lanesconvert test!)
+        S.requireFailure("lanes.linda():send(0, 'k', setmetatable({}, {__lanesconvert = function(where_) error (where_ .. ': should not send me' end}))");
+        // but a registered non-deep userdata should work
+        S.requireSuccess("lanes.linda():send(0, 'k', io.stdin)");
+    }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION("unsupported values fail")
+TEST_CASE("linda.single_keeper.the_rest")
-        {
+{
-            // value checks
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
-            // linda:send() should fail if we don't send anything
+    S.requireSuccess("lanes = require 'lanes'");
-            S.requireFailure("lanes.linda():send()");
-            S.requireFailure("lanes.linda():send(0)");
+    // ---------------------------------------------------------------------------------------------
-            S.requireFailure("lanes.linda():send(0, 'k')");
-            // or non-deep userdata
+    SECTION("error in close handler is propagated")
-            S.requireFailure("lanes.linda():send(0, 'k', fixture.newuserdata())");
+    {
-            // or something with a converter that raises an error (maybe that should go to a dedicated __lanesconvert test!)
+        // if the function raises an error, we should get it
-            S.requireFailure("lanes.linda():send(0, 'k', setmetatable({}, {__lanesconvert = function(where_) error (where_ .. ': should not send me' end}))");
+        S.requireFailure("local l <close> = lanes.linda{close_handler = function() error 'gluh' end}");
-            // but a registered non-deep userdata should work
-            S.requireSuccess("lanes.linda():send(0, 'k', io.stdin)");
-        }
    }
    // ---------------------------------------------------------------------------------------------
@@ -312,12 +374,12 @@ TEST_CASE("linda.multi Keeper")
    S.requireSuccess("lanes = require 'lanes'.configure{nb_user_keepers = 3}");
-    S.requireFailure("lanes.linda(-1)");
+    S.requireFailure("lanes.linda{group = -1}");
-    S.requireSuccess("lanes.linda(0)");
+    S.requireSuccess("lanes.linda{group = 0}");
-    S.requireSuccess("lanes.linda(1)");
+    S.requireSuccess("lanes.linda{group = 1}");
-    S.requireSuccess("lanes.linda(2)");
+    S.requireSuccess("lanes.linda{group = 2}");
-    S.requireSuccess("lanes.linda(3)");
+    S.requireSuccess("lanes.linda{group = 3}");
-    S.requireFailure("lanes.linda(4)");
+    S.requireFailure("lanes.linda{group = 4}");
 }
 // #################################################################################################
@@ -327,23 +389,26 @@ TEST_CASE("linda.multi Keeper")
 // so let's create a separate test case for each file with an ugly macro...
 #define MAKE_TEST_CASE(DIR, FILE) \
-TEST_CASE("scripted tests." #DIR "." #FILE) \
+TEST_CASE("scripted_tests." #DIR "." #FILE) \
 { \
    FileRunner _runner(R"(.\unit_tests\scripts)"); \
    _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::AssertNoLuaError }); \
 }
+MAKE_TEST_CASE(linda, multiple_keepers)
 MAKE_TEST_CASE(linda, send_receive)
+MAKE_TEST_CASE(linda, send_receive_func_and_string)
 MAKE_TEST_CASE(linda, send_registered_userdata)
-MAKE_TEST_CASE(linda, multiple_keepers)
+MAKE_TEST_CASE(linda, wake_period)
 /*
-TEST_CASE("linda.scripted tests")
+TEST_CASE("linda.scripted_tests")
 {
    auto const& _testParam = GENERATE(
+        FileRunnerParam{ "linda/multiple_keepers", TestType::AssertNoLuaError },
        FileRunnerParam{ "linda/send_receive", TestType::AssertNoLuaError },
        FileRunnerParam{ "linda/send_registered_userdata", TestType::AssertNoLuaError },
-        FileRunnerParam{ "linda/multiple_keepers", TestType::AssertNoLuaError }
+        FileRunnerParam{ "linda/wake_period", TestType::AssertNoLuaError }
    );
    FileRunner _runner(R"(.\unit_tests\scripts)");
diff --git a/unit_tests/scripts/_utils.lua b/unit_tests/scripts/_utils.lua
index d710702..9f46237 100644
--- a/unit_tests/scripts/_utils.lua
+++ b/unit_tests/scripts/_utils.lua
@@ -68,8 +68,26 @@ local function dump_error_stack(error_reporting_mode_, stack)
    end
 end
+-- a function that yields back what got in, one element at a time
+local yield_one_by_one = function(...)
+    local PRINT = MAKE_PRINT()
+    PRINT "In lane"
+    for _i  = 1, select('#', ...) do
+        local _val = select(_i, ...)
+        PRINT("yielding #", _i, _val)
+        local _ack = coroutine.yield(_val)
+        if cancel_test and cancel_test() then -- cancel_test does not exist when run immediately (not in a Lane)
+            return "cancelled!"
+        end
+        -- of course, if we are cancelled, we were not resumed, and yield() didn't return what we expect
+        assert(_ack == _i)
+    end
+    return "bye!"
+end
 return {
    MAKE_PRINT = MAKE_PRINT,
    tables_match = tables_match,
-    dump_error_stack = dump_error_stack
+    dump_error_stack = dump_error_stack,
+    yield_one_by_one = yield_one_by_one
 }
diff --git a/unit_tests/scripts/_utils54.lua b/unit_tests/scripts/_utils54.lua
new file mode 100644
index 0000000..a511563
--- /dev/null
+++ b/unit_tests/scripts/_utils54.lua
@@ -0,0 +1,30 @@
+local utils = require "_utils"
+-- expand _utils module with Lua5.4 specific stuff
+-- a lane body that yields stuff
+utils.yielder_with_to_be_closed = function(out_linda_, wait_)
+        local fixture = assert(require "fixture")
+        -- here is a to-be-closed variable that, when closed, sends "Closed!" in the "out" slot of the provided linda
+        local t <close> = setmetatable(
+                { text = "Closed!" }, {
+                        __close = function(self, err)
+                                if wait_ then
+                                        fixture.block_for(wait_)
+                                end
+                                out_linda_:send("out", self.text)
+                        end
+                }
+        )
+        -- yield forever, but be cancel-friendly
+        local n = 1
+        while true do
+                coroutine.yield("I yield!", n)
+                if cancel_test and cancel_test() then -- cancel_test does not exist when run immediately (not in a Lane)
+                        return "I am cancelled"
+                end
+                n = n + 1
+        end
+end
+return utils
diff --git a/unit_tests/scripts/coro/basics.lua b/unit_tests/scripts/coro/basics.lua
deleted file mode 100644
index cd2f410..0000000
--- a/unit_tests/scripts/coro/basics.lua
+++ /dev/null
@@ -1,97 +0,0 @@
-local lanes = require "lanes"
-local fixture = require "fixture"
-lanes.finally(fixture.throwing_finalizer)
-local utils = lanes.require "_utils"
-local PRINT = utils.MAKE_PRINT()
-if true then
-    -- a lane body that just returns some value
-    local lane = function(msg_)
-        local utils = lanes.require "_utils"
-        local PRINT = utils.MAKE_PRINT()
-        PRINT "In lane"
-        assert(msg_ == "hi")
-        return "bye"
-    end
-    -- the generator
-    local g1 = lanes.coro("*", {name = "auto"}, lane)
-    -- launch lane
-    local h1 = g1("hi")
-    local r = h1[1]
-    assert(r == "bye")
-end
-- a lane coroutine that yields back what got in, one element at a time
-local yielder = function(...)
-    local utils = lanes.require "_utils"
-    local PRINT = utils.MAKE_PRINT()
-    PRINT "In lane"
-    for _i  = 1, select('#', ...) do
-        local _val = select(_i, ...)
-        PRINT("yielding #", _i, _val)
-        local _ack = coroutine.yield(_val)
-        assert(_ack == _i)
-    end
-    return "done!"
-end
-if true then
-    -- if we start a non-coroutine lane with a yielding function, we should get an error, right?
-    local fun_g = lanes.gen("*", { name = 'auto' }, yielder)
-    local h = fun_g("hello", "world", "!")
-    local err, status, stack = h:join()
-    PRINT(err, status, stack)
-    -- the actual error message is not the same for Lua 5.1
-    -- of course, it also has to be different for LuaJIT as well
-    -- also, LuaJIT prepends a file:line to the actual error message, which Lua5.1 does not.
-    local msgs = {
-        ["Lua 5.1"] = jit and "attempt to yield across C-call boundary" or "attempt to yield across metamethod/C-call boundary",
-        ["Lua 5.2"] = "attempt to yield from outside a coroutine",
-        ["Lua 5.3"] = "attempt to yield from outside a coroutine",
-        ["Lua 5.4"] = "attempt to yield from outside a coroutine"
-    }
-    local expected_msg = msgs[_VERSION]
-    PRINT("expected_msg = " .. expected_msg)
-    assert(err == nil and string.find(status, expected_msg, 1, true) and stack == nil, "status = " .. status)
-end
-- the generator
-local coro_g = lanes.coro("*", {name = "auto"}, yielder)
-if true then
-    -- launch coroutine lane
-    local h2 = coro_g("hello", "world", "!")
-    -- read the yielded values, sending back the expected index
-    assert(h2:resume(1) == "hello")
-    assert(h2:resume(2) == "world")
-    assert(h2:resume(3) == "!")
-    -- the lane return value is available as usual
-    local r = h2[1]
-    assert(r == "done!")
-end
-if true then
-    -- another coroutine lane
-    local h3 = coro_g("hello", "world", "!")
-    -- yielded values are available as regular return values
-    assert(h3[1] == "hello" and h3.status == "suspended")
-    -- since we consumed the returned values, they should not be here when we resume
-    assert(h3:resume(1) == nil)
-    -- similarly, we can get them with join()
-    assert(h3:join() == "world" and h3.status == "suspended")
-    -- since we consumed the returned values, they should not be here when we resume
-    assert(h3:resume(2) == nil)
-    -- the rest should work as usual
-    assert(h3:resume(3) == "!")
-    -- the final return value of the lane body remains to be read
-    assert(h3:join() == "done!" and h3.status == "done")
-end
diff --git a/unit_tests/scripts/coro/cancelling_suspended.lua b/unit_tests/scripts/coro/cancelling_suspended.lua
new file mode 100644
index 0000000..3a29e55
--- /dev/null
+++ b/unit_tests/scripts/coro/cancelling_suspended.lua
@@ -0,0 +1,31 @@
+local fixture = require "fixture"
+local lanes = require "lanes".configure{on_state_create = fixture.on_state_create}
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+--------------------------------------------------
+-- TEST: cancelling a suspended Lane should end it
+--------------------------------------------------
+if true then
+        -- the generator
+        local coro_g = lanes.coro("*", utils.yield_one_by_one)
+        -- start the lane
+        local h = coro_g("hello", "world", "!")
+        repeat until h.status == "suspended"
+        -- first cancellation attempt: don't wake the lane
+        local b, r = h:cancel("soft", 0.5)
+        -- the lane is still blocked in its suspended state
+        assert(b == false and r == "timeout" and h.status == "suspended", "got " .. tostring(b) .. " " .. tostring(r) .. " " .. h.status)
+        -- cancel the Lane again, this time waking it. it will resume, and yielder()'s will break out of its infinite loop
+        h:cancel("soft", nil, true)
+        -- lane should be done, because it returned cooperatively when detecting a soft cancel
+        assert(h.status == "done", "got " .. h.status)
+end
diff --git a/unit_tests/scripts/coro/collect_yielded_lane.lua b/unit_tests/scripts/coro/collect_yielded_lane.lua
new file mode 100644
index 0000000..2ee58f8
--- /dev/null
+++ b/unit_tests/scripts/coro/collect_yielded_lane.lua
@@ -0,0 +1,64 @@
+local fixture = require "fixture"
+local lanes = require "lanes".configure{on_state_create = fixture.on_state_create}
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+-- this test is only for Lua 5.4+
+local utils = lanes.require "_utils54"
+local PRINT = utils.MAKE_PRINT()
+local out_linda = lanes.linda()
+------------------------------------------------------------------------------
+-- TEST: to-be-closed variables are properly closed when the lane is collected
+------------------------------------------------------------------------------
+if true then
+        -- the generator
+        local coro_g = lanes.coro("*", utils.yielder_with_to_be_closed)
+        -- start the lane
+        local h = coro_g(out_linda)
+        -- join the lane. it should be done and give back the values resulting of the first yield point
+        local r, v1, v2 = h:join()
+        assert(r == true and v1 == "I yield!" and v2 == 1, "got " .. tostring(r) .. " " .. tostring(v1) .. " " .. tostring(v2))
+        assert(h.status == "done", "got " .. h.status)
+        -- force collection of the lane
+        h = nil
+        collectgarbage()
+        -- I want the to-be-closed variable of the coroutine linda to be properly closed
+        local s, r = out_linda:receive(0, "out")
+        assert(s == "out" and r == "Closed!", "coro got " .. tostring(s) .. " " .. tostring(r)) -- THIS TEST FAILS
+end
+---------------------------------------------------------------------------------------------------
+-- TEST: if a to-be-closed handler takes longer than the join timeout, everything works as expected
+---------------------------------------------------------------------------------------------------
+if true then
+        -- the generator
+        local coro_g = lanes.coro("*", utils.yielder_with_to_be_closed)
+        -- start the lane. The to-be-closed handler will sleep for 1 second
+        local h = coro_g(out_linda, 1)
+        -- first join attempt should timeout
+        local r, v = h:join(0.6)
+        assert(r == nil and v == "timeout", "got " .. tostring(r) .. " " .. tostring(v))
+        assert(h.status == "running", "got " .. h.status)
+        -- join the lane again. it should be done and give back the values resulting of the first yield point
+        local r, v1, v2 = h:join(0.6)
+        assert(r == true and v1 == "I yield!" and v2 == 1, "got " .. tostring(r) .. " " .. tostring(v1) .. " " .. tostring(v2))
+        assert(h.status == "done", "got " .. h.status)
+        -- force collection of the lane
+        h = nil
+        collectgarbage()
+        -- I want the to-be-closed variable of the coroutine linda to be properly closed
+        local s, r = out_linda:receive(0, "out")
+        assert(s == "out" and r == "Closed!", "coro got " .. tostring(s) .. " " .. tostring(r)) -- THIS TEST FAILS
+end
diff --git a/unit_tests/scripts/coro/error_handling.lua b/unit_tests/scripts/coro/error_handling.lua
index ba6cff6..1cfb8c8 100644
--- a/unit_tests/scripts/coro/error_handling.lua
+++ b/unit_tests/scripts/coro/error_handling.lua
@@ -38,15 +38,15 @@ local force_error_test = function(error_trace_level_)
    utils.dump_error_stack(error_trace_level_, c)
 end
-if false then
+if true then
    force_error_test("minimal")
 end
-if false then
+if true then
    force_error_test("basic")
 end
-if false then
+if true then
    force_error_test("extended")
 end
diff --git a/unit_tests/scripts/coro/index_suspended.lua b/unit_tests/scripts/coro/index_suspended.lua
new file mode 100644
index 0000000..2cd8c28
--- /dev/null
+++ b/unit_tests/scripts/coro/index_suspended.lua
@@ -0,0 +1,28 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- the coroutine generator
+local coro_g = lanes.coro("*", {name = "auto"}, utils.yield_one_by_one)
+-------------------------------------------------------------------------
+-- TEST: if we index a yielded lane, we should get the last yielded value
+-------------------------------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the first yielded value, sending back the expected index
+    assert(h:resume(1) == "hello")
+    -- indexing multiple times gives back the same us the same yielded value
+    local r1 = h[1]
+    local r2 = h[1]
+    local r3 = h[1]
+    assert(r1 == "world" and r2 == "world" and r3 == "world", "got " .. r1 .. " " .. r2 .. " " .. r3)
+    -- once the lane was indexed, it is no longer resumable (just like after join)
+    local b, e = pcall(h.resume, h, 2)
+    assert(b == false and e == "cannot resume non-suspended coroutine Lane")
+end
diff --git a/unit_tests/scripts/coro/join_suspended.lua b/unit_tests/scripts/coro/join_suspended.lua
new file mode 100644
index 0000000..33be406
--- /dev/null
+++ b/unit_tests/scripts/coro/join_suspended.lua
@@ -0,0 +1,24 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- the coroutine generator
+local coro_g = lanes.coro("*", {name = "auto"}, utils.yield_one_by_one)
+---------------------------------------------------
+-- TEST: if we join a yielded lane, the lane aborts
+---------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the first yielded value, sending back the expected index
+    assert(h:resume(1) == "hello")
+    -- join the lane. since it will reach a yield point, it unblocks and ends. last yielded values are returned normally
+    local b, r = h:join(0.5)
+    local s = h.status
+    assert(s == "done" and b == true and r == "world", "got " .. s .. " " .. tostring(b) .. " " .. tostring(r))
+end
diff --git a/unit_tests/scripts/coro/linda_in_close_handler.lua b/unit_tests/scripts/coro/linda_in_close_handler.lua
new file mode 100644
index 0000000..8636f01
--- /dev/null
+++ b/unit_tests/scripts/coro/linda_in_close_handler.lua
@@ -0,0 +1,43 @@
+local fixture = require "fixture"
+local lanes = require "lanes".configure{on_state_create = fixture.on_state_create}
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+-- this test is only for Lua 5.4+
+local utils = lanes.require "_utils54"
+local PRINT = utils.MAKE_PRINT()
+local out_linda = lanes.linda()
+local test_close = function(what_, f_)
+        local c = coroutine.create(f_)
+        for i = 1, 10 do
+                local t, r1, r2 = coroutine.resume(c, out_linda) -- returns true + <yielded values>
+                assert(t == true and r1 == "I yield!" and r2 == i, "got " .. tostring(t) .. " " .. tostring(r1) .. " " .. tostring(r2))
+                local s = coroutine.status(c)
+                assert(s == "suspended")
+        end
+        local r, s = coroutine.close(c)
+        assert(r == true and s == nil)
+        -- the local variable inside the yielder body should be closed
+        local s, r = out_linda:receive(0, "out")
+        assert(s == "out" and r == "Closed!", what_ .. " got " .. tostring(s) .. " " .. tostring(r))
+end
+---------------------------------------------------------
+-- TEST: first, try the close mechanism outside of a lane
+---------------------------------------------------------
+if true then
+        assert(type(utils.yielder_with_to_be_closed) == "function")
+        test_close("base", utils.yielder_with_to_be_closed)
+end
+---------------------------------------------------------------
+-- TEST: try again with a function obtained through dump/undump
+---------------------------------------------------------------
+if true then
+        -- note this means our yielder implementation can't have upvalues, as they are lost in the process
+        test_close("dumped", load(string.dump(utils.yielder_with_to_be_closed)))
+end
diff --git a/unit_tests/scripts/coro/regular_function.lua b/unit_tests/scripts/coro/regular_function.lua
new file mode 100644
index 0000000..09aa3b7
--- /dev/null
+++ b/unit_tests/scripts/coro/regular_function.lua
@@ -0,0 +1,38 @@
+local lanes = require "lanes".configure()
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- a lane body that just returns some value
+local returner = function(msg_)
+    local utils = lanes.require "_utils"
+    local PRINT = utils.MAKE_PRINT()
+    PRINT "In lane"
+    assert(msg_ == "hi")
+    return "bye"
+end
+-- a function that returns some value can run in a coroutine
+if true then
+    -- the generator
+    local g = lanes.coro("*", {name = "auto"}, returner)
+    -- launch lane
+    local h = g("hi")
+    local r = h[1]
+    assert(r == "bye")
+end
+-- can't resume a coro after the lane body has returned
+if true then
+    -- the generator
+    local g = lanes.coro("*", {name = "auto"}, returner)
+    -- launch lane
+    local h = g("hi")
+    -- resuming a lane that terminated execution should raise an error
+    local b, e = pcall(h.resume, h)
+    assert(b == false and type(e) == "string")
+end
diff --git a/unit_tests/scripts/coro/resume_basics.lua b/unit_tests/scripts/coro/resume_basics.lua
new file mode 100644
index 0000000..5b124f5
--- /dev/null
+++ b/unit_tests/scripts/coro/resume_basics.lua
@@ -0,0 +1,40 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- the coroutine generator
+local coro_g = lanes.coro("*", {name = "auto"}, utils.yield_one_by_one)
+-------------------------------------------------------------------------------------------------
+-- TEST: we can resume as many times as the lane yields, then read the returned value on indexing
+-------------------------------------------------------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the yielded values, sending back the expected index
+    assert(h:resume(1) == "hello")
+    assert(h:resume(2) == "world")
+    assert(h:resume(3) == "!")
+    -- the lane return value is available as usual
+    local r = h[1]
+    assert(r == "bye!")
+end
+---------------------------------------------------------------------------------------------
+-- TEST: we can resume as many times as the lane yields, then read the returned value on join
+---------------------------------------------------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the yielded values, sending back the expected index
+    assert(h:resume(1) == "hello")
+    assert(h:resume(2) == "world")
+    assert(h:resume(3) == "!")
+    -- the lane return value is available as usual
+    local s, r = h:join()
+    assert(h.status == "done" and s == true and r == "bye!")
+end
diff --git a/unit_tests/scripts/coro/yielding_in_non_coro_errors.lua b/unit_tests/scripts/coro/yielding_in_non_coro_errors.lua
new file mode 100644
index 0000000..fc0c072
--- /dev/null
+++ b/unit_tests/scripts/coro/yielding_in_non_coro_errors.lua
@@ -0,0 +1,28 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+--------------------------------------------------------------------------------------------------
+-- TEST: if we start a non-coroutine lane with a yielding function, we should get an error, right?
+--------------------------------------------------------------------------------------------------
+local fun_g = lanes.gen("*", { name = 'auto' }, utils.yield_one_by_one)
+local h = fun_g("hello", "world", "!")
+local err, status, stack = h:join()
+PRINT(err, status, stack)
+-- the actual error message is not the same for Lua 5.1
+-- of course, it also has to be different for LuaJIT as well
+-- also, LuaJIT prepends a file:line to the actual error message, which Lua5.1 does not.
+local msgs = {
+    ["Lua 5.1"] = jit and "attempt to yield across C-call boundary" or "attempt to yield across metamethod/C-call boundary",
+    ["Lua 5.2"] = "attempt to yield from outside a coroutine",
+    ["Lua 5.3"] = "attempt to yield from outside a coroutine",
+    ["Lua 5.4"] = "attempt to yield from outside a coroutine",
+    ["Lua 5.5"] = "attempt to yield from outside a coroutine"
+}
+local expected_msg = msgs[_VERSION]
+PRINT("expected_msg = " .. expected_msg)
+assert(err == nil and string.find(status, expected_msg, 1, true) and stack == nil, "status = " .. status)
diff --git a/unit_tests/scripts/lane/body_is_a_c_function.lua b/unit_tests/scripts/lane/body_is_a_c_function.lua
new file mode 100644
index 0000000..d8d329f
--- /dev/null
+++ b/unit_tests/scripts/lane/body_is_a_c_function.lua
@@ -0,0 +1,28 @@
+local lanes = require "lanes".configure()
+-- ##################################################################################################
+-- ##################################################################################################
+-- ##################################################################################################
+-- we can create a generator where the lane body is a C function
+do
+    local b, g = pcall(lanes.gen, "*", print)
+    assert(b == true and type(g) == "function")
+    -- we can start the lane
+    local b, h = pcall(g, "hello")
+    -- the lane runs normally
+    h:join()
+    assert(h.status == "done")
+end
+-- we can create a generator where the lane body is a C function that raises an error
+do
+    local b, g = pcall(lanes.gen, "*", error)
+    assert(b == true and type(g) == "function")
+    -- we can start the lane
+    local b, h = pcall(g, "this is an error")
+    -- this provides the error that occurred in the lane
+    local s, e, t = h:join()
+    assert(h.status == "error")
+    assert(s == nil and e == "this is an error" and t == nil)
+end
diff --git a/unit_tests/scripts/lane/cooperative_shutdown.lua b/unit_tests/scripts/lane/cooperative_shutdown.lua
index 756e33c..0a0943e 100644
--- a/unit_tests/scripts/lane/cooperative_shutdown.lua
+++ b/unit_tests/scripts/lane/cooperative_shutdown.lua
@@ -1,10 +1,10 @@
-local lanes = require "lanes"
+local lanes = require "lanes".configure{on_state_create = require "fixture".on_state_create}
 -- launch lanes that cooperate properly with cancellation request
 local lane1 = function()
        lane_threadname("lane1")
-        -- loop breaks on cancellation request
+        -- loop breaks on soft cancellation request
        repeat
                lanes.sleep(0)
        until cancel_test()
@@ -23,7 +23,6 @@ end
 local lane3 = function()
        lane_threadname("lane3")
        -- this one cooperates too, because of the hook cancellation modes that Lanes will be using
-        -- but not with LuaJIT, because the function is compiled, and we don't call anyone, so no hook triggers
        local fixture = require "fixture"
        repeat until fixture.give_me_back(false)
 end
@@ -43,7 +42,14 @@ local h2 = g2(linda)
 local h3 = g3()
-- wait until they are both started
+lanes.sleep(0.1)
-repeat until h1.status == "running" and h2.status == "waiting" and h3.status == "running"
+local is_running = function(lane_h)
+        local status = lane_h.status
+        return status == "running" or status == "waiting"
+end
+-- wait until they are all started
+repeat until is_running(h1) and is_running(h2) and is_running(h3)
 -- let the script terminate, Lanes should not crash at shutdown
diff --git a/unit_tests/scripts/lane/tasking_cancelling.lua b/unit_tests/scripts/lane/tasking_cancelling.lua
index 85600ab..d153ffa 100644
--- a/unit_tests/scripts/lane/tasking_cancelling.lua
+++ b/unit_tests/scripts/lane/tasking_cancelling.lua
@@ -1,4 +1,7 @@
-local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure(config).configure()
+local require_fixture_result_1, require_fixture_result_2 = require "fixture"
+local fixture = assert(require_fixture_result_1)
+local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{on_state_create = fixture.on_state_create}.configure()
 print("require_lanes_result:", require_lanes_result_1, require_lanes_result_2)
 local lanes = require_lanes_result_1
@@ -15,69 +18,34 @@ local lanes_linda = assert(lanes.linda)
 -- ##################################################################################################
 -- ##################################################################################################
-local function task(a, b, c)
+-- cancellation of cooperating lanes
-    lane_threadname("task("..a..","..b..","..c..")")
+local cooperative = function()
-    --error "111"     -- testing error messages
+    local fixture = assert(require "fixture")
-    assert(hey)
+    local which_cancel
-    local v=0
+    repeat
-    for i=a,b,c do
+        fixture.block_for(0.2)
-        v= v+i
+        which_cancel = cancel_test()
-    end
+    until which_cancel
-    return v, hey
+    return which_cancel
-end
-local gc_cb = function(name_, status_)
-    PRINT("                             ---> lane '" .. name_ .. "' collected with status '" .. status_ .. "'")
 end
+-- soft and hard are behaviorally equivalent when no blocking linda operation is involved
+local cooperative_lane_soft = lanes_gen("*", { name = 'auto' }, cooperative)()
+local a, b = cooperative_lane_soft:cancel("soft", 0) -- issue request, do not wait for lane to terminate
+assert(a == false and b == "timeout", "got " .. tostring(a) .. " " .. tostring(b))
+assert(cooperative_lane_soft[1] == "soft") -- return value of the lane body is the value returned by cancel_test()
+local cooperative_lane_hard = lanes_gen("*", { name = 'auto' }, cooperative)()
+local c, d = cooperative_lane_hard:cancel("hard", 0) -- issue request, do not wait for lane to terminate
+assert(a == false and b == "timeout", "got " .. tostring(c) .. " " .. tostring(d))
+assert(cooperative_lane_hard[1] == "hard") -- return value of the lane body is the value returned by cancel_test()
 -- ##################################################################################################
-- ##################################################################################################
-- ##################################################################################################
-PRINT("\n\n", "---=== Tasking (cancelling) ===---", "\n\n")
-local task_launch2 = lanes_gen("", { name = 'auto', globals={hey=true}, gc_cb = gc_cb }, task)
-local N=999999999
-local lane9= task_launch2(1,N,1)   -- huuuuuuge...
-- Wait until state changes "pending"->"running"
--
-local st
-local t0= os.time()
-while os.time()-t0 < 5 do
-    st= lane9.status
-    io.stderr:write((i==1) and st.." " or '.')
-    if st~="pending" then break end
-end
-PRINT(" "..st)
-if st=="error" then
-    local _= lane9[0]  -- propagate the error here
-end
-if st=="done" then
-    error("Looping to "..N.." was not long enough (cannot test cancellation)")
-end
-assert(st=="running", "st == " .. st)
-- when running under luajit, the function is JIT-ed, and the instruction count isn't hit, so we need a different hook
-lane9:cancel(jit and "line" or "count", 100) -- 0 timeout, hook triggers cancelslation when reaching the specified count
-local t0= os.time()
-while os.time()-t0 < 5 do
-    st= lane9.status
-    io.stderr:write((i==1) and st.." " or '.')
-    if st~="running" then break end
-end
-PRINT(" "..st)
-assert(st == "cancelled", "st is '" .. st .. "' instead of 'cancelled'")
 -- cancellation of lanes waiting on a linda
-local limited = lanes_linda("limited")
+local limited = lanes_linda{name = "limited"}
 assert.fails(function() limited:limit("key", -1) end)
 assert.failsnot(function() limited:limit("key", 1) end)
 -- [[################################################
-limited:send("key", "hello") -- saturate linda
+limited:send("key", "hello") -- saturate linda, so that subsequent sends will block
 for k, v in pairs(limited:dump()) do
    PRINT("limited[" .. tostring(k) .. "] = " .. tostring(v))
 end
@@ -88,11 +56,15 @@ local wait_send = function()
 end
 local wait_send_lane = lanes_gen("*", { name = 'auto' }, wait_send)()
-repeat until wait_send_lane.status == "waiting"
+repeat
-print "wait_send_lane is waiting"
+    io.stderr:write('!')
+    -- currently mingw64 builds can deadlock if we cancel the lane too early (before the linda blocks, at it causes the linda condvar not to be signalled)
+    lanes.sleep(0.1)
+until wait_send_lane.status == "waiting"
+PRINT "wait_send_lane is waiting"
 wait_send_lane:cancel() -- hard cancel, 0 timeout
 repeat until wait_send_lane.status == "cancelled"
-print "wait_send_lane is cancelled"
+PRINT "wait_send_lane is cancelled"
 --################################################]]
 local wait_receive = function()
    local k, v
@@ -101,22 +73,30 @@ local wait_receive = function()
 end
 local wait_receive_lane = lanes_gen("*", { name = 'auto' }, wait_receive)()
-repeat until wait_receive_lane.status == "waiting"
+repeat
-print "wait_receive_lane is waiting"
+    io.stderr:write('!')
+    -- currently mingw64 builds can deadlock if we cancel the lane too early (before the linda blocks, at it causes the linda condvar not to be signalled)
+    lanes.sleep(0.1)
+until wait_receive_lane.status == "waiting"
+PRINT "wait_receive_lane is waiting"
 wait_receive_lane:cancel() -- hard cancel, 0 timeout
 repeat until wait_receive_lane.status == "cancelled"
-print "wait_receive_lane is cancelled"
+PRINT "wait_receive_lane is cancelled"
 --################################################]]
 local wait_receive_batched = function()
    local k, v1, v2
    set_finalizer(function() print("wait_receive_batched", k, v1, v2) end)
-    k, v1, v2 = limited:receive(limited.batched, "dummy", 2) -- infinite timeout, returns only when lane is cancelled
+    k, v1, v2 = limited:receive_batched("dummy", 2) -- infinite timeout, returns only when lane is cancelled
 end
 local wait_receive_batched_lane = lanes_gen("*", { name = 'auto' }, wait_receive_batched)()
-repeat until wait_receive_batched_lane.status == "waiting"
+repeat
-print "wait_receive_batched_lane is waiting"
+    io.stderr:write('!')
+    -- currently mingw64 builds can deadlock if we cancel the lane too early (before the linda blocks, at it causes the linda condvar not to be signalled)
+    lanes.sleep(0.1)
+until wait_receive_batched_lane.status == "waiting"
+PRINT "wait_receive_batched_lane is waiting"
 wait_receive_batched_lane:cancel() -- hard cancel, 0 timeout
 repeat until wait_receive_batched_lane.status == "cancelled"
-print "wait_receive_batched_lane is cancelled"
+PRINT "wait_receive_batched_lane is cancelled"
 --################################################]]
diff --git a/unit_tests/scripts/lane/tasking_cancelling_with_hook.lua b/unit_tests/scripts/lane/tasking_cancelling_with_hook.lua
new file mode 100644
index 0000000..56b934f
--- /dev/null
+++ b/unit_tests/scripts/lane/tasking_cancelling_with_hook.lua
@@ -0,0 +1,68 @@
+local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure(config).configure()
+print("require_lanes_result:", require_lanes_result_1, require_lanes_result_2)
+local lanes = require_lanes_result_1
+local require_assert_result_1, require_assert_result_2 = require "_assert"
+print("require_assert_result:", require_assert_result_1, require_assert_result_2)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- ##################################################################################################
+-- ##################################################################################################
+-- ##################################################################################################
+local function task(a, b, c)
+    lane_threadname("task("..a..","..b..","..c..")")
+    --error "111"     -- testing error messages
+    assert(hey)
+    local v=0
+    for i=a,b,c do
+        v= v+i
+    end
+    return v, hey
+end
+local gc_cb = function(name_, status_)
+    PRINT("                             ---> lane '" .. name_ .. "' collected with status '" .. status_ .. "'")
+end
+-- ##################################################################################################
+-- ##################################################################################################
+-- ##################################################################################################
+local generator = lanes.gen("", { name = 'auto', globals={hey=true}, gc_cb = gc_cb }, task)
+local N = 999999999
+local lane_h = generator(1,N,1)   -- huuuuuuge...
+-- Wait until state changes "pending"->"running"
+--
+local st
+local t0 = os.time()
+while os.time()-t0 < 5 do
+    st = lane_h.status
+    io.stderr:write((i==1) and st.." " or '.')
+    if st~="pending" then break end
+end
+PRINT(" "..st)
+if st == "error" then
+    local _ = lane_h[0]  -- propagate the error here
+end
+if st == "done" then
+    error("Looping to "..N.." was not long enough (cannot test cancellation)")
+end
+assert(st == "running", "st == " .. st)
+-- when running under luajit, the function is JIT-ed, and the instruction count isn't hit, so we need a different hook
+lane_h:cancel(jit and "line" or "count", 100) -- 0 timeout, hook triggers cancelslation when reaching the specified count
+local t0 = os.time()
+while os.time()-t0 < 5 do
+    st = lane_h.status
+    io.stderr:write((i==1) and st.." " or '.')
+    if st~="running" then break end
+end
+PRINT(" "..st)
+assert(st == "cancelled", "st is '" .. st .. "' instead of 'cancelled'")
diff --git a/unit_tests/scripts/lane/tasking_comms_criss_cross.lua b/unit_tests/scripts/lane/tasking_comms_criss_cross.lua
index 497e81d..610da8b 100644
--- a/unit_tests/scripts/lane/tasking_comms_criss_cross.lua
+++ b/unit_tests/scripts/lane/tasking_comms_criss_cross.lua
@@ -42,7 +42,7 @@ local tc = lanes_gen("io", { name = 'auto', gc_cb = gc_cb },
  end
 )
-local linda= lanes_linda("criss cross")
+local linda= lanes_linda{name = "criss cross"}
 local a,b= tc(linda, "A","B"), tc(linda, "B","A")   -- launching two lanes, twisted comms
diff --git a/unit_tests/scripts/lane/tasking_communications.lua b/unit_tests/scripts/lane/tasking_communications.lua
index 1fd43b0..01842b4 100644
--- a/unit_tests/scripts/lane/tasking_communications.lua
+++ b/unit_tests/scripts/lane/tasking_communications.lua
@@ -72,7 +72,7 @@ local chunk= function(linda)
    WR("chunk ", "Lane ends!\n")
 end
-local linda = lanes_linda("communications")
+local linda = lanes_linda{name = "communications"}
 assert(type(linda) == "userdata" and tostring(linda) == "Linda: communications")
    --
    -- ["->"] master -> slave
@@ -90,7 +90,7 @@ local b,x,y,z,w = linda:get("<->", 4)
 assert(b == 3 and x == "x" and y == "y" and z == "z" and w == nil)
 local k, x = linda:receive("<->")
 assert(k == "<->" and x == "x")
-local k,y,z = linda:receive(linda.batched, "<->", 2)
+local k,y,z = linda:receive_batched("<->", 2)
 assert(k == "<->" and y == "y" and z == "z")
 linda:set("<->")
 local b,x,y,z,w = linda:get("<->", 4)
diff --git a/unit_tests/scripts/lane/tasking_join_test.lua b/unit_tests/scripts/lane/tasking_join_test.lua
index 2fbce6c..495a709 100644
--- a/unit_tests/scripts/lane/tasking_join_test.lua
+++ b/unit_tests/scripts/lane/tasking_join_test.lua
@@ -30,14 +30,19 @@ end
 PRINT("---=== :join test ===---", "\n\n")
+-- a lane body that returns nothing is successfully joined with true, nil
+local r, ret = lanes_gen(function() end)():join()
+assert(r == true and ret == nil)
 -- NOTE: 'unpack()' cannot be used on the lane handle; it will always return nil
 --       (unless [1..n] has been read earlier, in which case it would seemingly
 --       work).
-local S= lanes_gen("table", { name = 'auto', gc_cb = gc_cb },
+local S = lanes_gen("table", { name = 'auto', gc_cb = gc_cb },
    function(arg)
        lane_threadname "join test lane"
        set_finalizer(function() end)
+        -- take arg table, reverse its contents in aux, then return the unpacked result
        local aux= {}
        for i, v in ipairs(arg) do
           table.insert(aux, 1, v)
@@ -46,15 +51,16 @@ local S= lanes_gen("table", { name = 'auto', gc_cb = gc_cb },
    return (unpack or table.unpack)(aux)
 end)
-h= S { 12, 13, 14 }     -- execution starts, h[1..3] will get the return values
+local h = S { 12, 13, 14 }     -- execution starts, h[1..3] will get the return values
 -- wait a bit so that the lane has a chance to set its debug name
 SLEEP(0.5)
 print("joining with '" .. h:get_threadname() .. "'")
-local a,b,c,d= h:join()
+local r, a, b, c, d = h:join()
 if h.status == "error" then
-    print(h:get_threadname(), "error: " , a, b, c, d)
+    print(h:get_threadname(), "error: " , r, a, b, c, d)
 else
-    print(h:get_threadname(), a,b,c,d)
+    print(h:get_threadname(), r, a, b, c, d)
+    assert(r==true, "r == " .. tostring(r))
    assert(a==14, "a == " .. tostring(a))
    assert(b==13, "b == " .. tostring(b))
    assert(c==12, "c == " .. tostring(c))
diff --git a/unit_tests/scripts/lane/tasking_send_receive_code.lua b/unit_tests/scripts/lane/tasking_send_receive_code.lua
index e329a88..fdc2602 100644
--- a/unit_tests/scripts/lane/tasking_send_receive_code.lua
+++ b/unit_tests/scripts/lane/tasking_send_receive_code.lua
@@ -53,28 +53,26 @@ local function chunk2(linda)
    assert(info.linedefined == 32, "bad linedefined")   -- start of 'chunk2'
    assert(config.strip_functions and info.currentline==-1 or info.currentline > info.linedefined, "bad currentline")   -- line of 'debug.getinfo'
    assert(info.lastlinedefined > info.currentline, "bad lastlinedefined")   -- end of 'chunk2'
-    local k,func= linda:receive("down")
+    assert(linda:count("down") == 2, "bad linda contents") -- function, "ok"
-    assert(type(func)=="function", "not a function")
+    local k,func,str= linda:receive_batched("down", 2)
    assert(k=="down")
+    assert(type(func)=="function", "not a function")
+    assert(str=="ok", "bad receive result: " .. tostring(k) .. " -> ".. tostring(str))
+    assert(linda:count("down") == 0, "bad linda contents") -- nothing
    func(linda)
-    local k,str= linda:receive("down")
-    assert(str=="ok", "bad receive result")
    linda:send("up", function() return ":)" end, "ok2")
 end
-local linda = lanes_linda("auto")
+local linda = lanes_linda{name = "auto"}
 local t2= lanes_gen("debug,package,string,io", { name = 'auto', gc_cb = gc_cb }, chunk2)(linda)     -- prepare & launch
-linda:send("down", function(linda) linda:send("up", "ready!") end,
+linda:send("down", function(linda) linda:send("up", "ready!") end, "ok")
-                    "ok")
 -- wait to see if the tiny function gets executed
 --
 local k,s= linda:receive(1, "up")
 if t2.status == "error" then
-    PRINT("t2 error: " , t2:join())
+    local n,err,s = t2:join()
-    assert(false)
+    assert(false, "t2 error: " .. err)
 end
 PRINT(s)
 assert(s=="ready!", s .. " is not 'ready!'")
diff --git a/unit_tests/scripts/lane/uncooperative_shutdown.lua b/unit_tests/scripts/lane/uncooperative_shutdown.lua
index 89e1ff8..eb89ed3 100644
--- a/unit_tests/scripts/lane/uncooperative_shutdown.lua
+++ b/unit_tests/scripts/lane/uncooperative_shutdown.lua
@@ -8,7 +8,7 @@ local lanes = require "lanes".configure{shutdown_timeout = 0.001, on_state_creat
 -- launch lanes that blocks forever
 local lane = function()
        local fixture = require "fixture"
-        fixture.sleep_for()
+        fixture.block_for()
 end
 -- the generator
diff --git a/unit_tests/scripts/linda/multiple_keepers.lua b/unit_tests/scripts/linda/multiple_keepers.lua
index 8733087..267d874 100644
--- a/unit_tests/scripts/linda/multiple_keepers.lua
+++ b/unit_tests/scripts/linda/multiple_keepers.lua
@@ -2,9 +2,9 @@
 local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{nb_user_keepers = 3, keepers_gc_threshold = 500}
 local lanes = require_lanes_result_1
-local a = lanes.linda("A", 1)
+local a = lanes.linda{name = "A", group = 1}
-local b = lanes.linda("B", 2)
+local b = lanes.linda{name = "B", group = 2}
-local c = lanes.linda("C", 3)
+local c = lanes.linda{name = "C", group = 3}
 -- store each linda in the other 2
 do
diff --git a/unit_tests/scripts/linda/send_receive_func_and_string.lua b/unit_tests/scripts/linda/send_receive_func_and_string.lua
new file mode 100644
index 0000000..188cfcd
--- /dev/null
+++ b/unit_tests/scripts/linda/send_receive_func_and_string.lua
@@ -0,0 +1,13 @@
+local lanes = require "lanes"
+-- a newly created linda doesn't contain anything
+local l = lanes.linda()
+-- send a function and a string, make sure that's what we read back
+l:send("k", function() end, "str")
+local c = l:count("k")
+assert(c == 2, "got " .. c)
+local k, v1, v2 = l:receive_batched("k", 2)
+local tv1, tv2 = type(v1), type(v2)
+assert(k == "k" and tv1 == "function" and tv2 == "string", "got " .. tv1 .. " " .. tv2)
+assert(l:count("k") == 0)
diff --git a/unit_tests/scripts/linda/send_registered_userdata.lua b/unit_tests/scripts/linda/send_registered_userdata.lua
index 2c0195a..90c05c9 100644
--- a/unit_tests/scripts/linda/send_registered_userdata.lua
+++ b/unit_tests/scripts/linda/send_registered_userdata.lua
@@ -1,5 +1,5 @@
 local lanes = require 'lanes'.configure{with_timers = false}
-local l = lanes.linda'gleh'
+local l = lanes.linda{name = 'gleh'}
 l:set('yo', io.stdin)
 local n, stdin_out = l:get('yo')
 assert(n == 1 and stdin_out == io.stdin, tostring(stdin_out) .. " ~= " .. tostring(io.stdin))
diff --git a/unit_tests/scripts/linda/wake_period.lua b/unit_tests/scripts/linda/wake_period.lua
new file mode 100644
index 0000000..d2dccc3
--- /dev/null
+++ b/unit_tests/scripts/linda/wake_period.lua
@@ -0,0 +1,42 @@
+-- default wake period is 0.5 seconds
+local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{linda_wake_period = 0.5}
+local lanes = require_lanes_result_1
+-- a lane that performs a blocking operation for 2 seconds
+local body = function(linda_)
+        -- a blocking read that lasts longer than the tested wake_period values
+        linda_:receive(2, "empty_slot")
+        return "done"
+end
+-- if we don't cancel the lane, we should wait the whole duration
+local function check_wake_duration(linda_, expected_, do_cancel_)
+        local h = lanes.gen(body)(linda_)
+        -- wait until the linda is blocked
+        repeat until h.status == "waiting"
+        local t0 = lanes.now_secs()
+        -- soft cancel, no timeout, no waking
+        if do_cancel_ then
+                local result, reason = h:cancel('soft', 0, false)
+                -- should say there was a timeout, since the lane didn't actually cancel (normal since we did not wake it)
+                assert(result == false and reason == 'timeout', "unexpected cancel result")
+        end
+        -- this should wait until the linda wakes by itself before the actual receive timeout and sees the cancel request
+        local r, ret = h:join()
+        assert(r == true and ret == "done")
+        local t1 = lanes.now_secs()
+        local delta = t1 - t0
+        -- the linda should check for cancellation at about the expected period, not earlier
+        assert(delta >= expected_, tostring(linda_) .. " woke too early:" .. delta)
+        -- the lane shouldn't terminate too long after cancellation was processed
+        assert(delta <= expected_ * 1.1, tostring(linda_) .. " woke too late: " .. delta)
+end
+-- legacy behavior: linda waits until operation timeout
+check_wake_duration(lanes.linda{name = "A", wake_period = 'never'}, 2, true)
+-- early wake behavior: linda wakes after the expected time, sees a cancellation requests, and aborts the operation early
+check_wake_duration(lanes.linda{name = "B", wake_period = 0.25}, 0.25, true)
+check_wake_duration(lanes.linda{name = "C"}, 0.5, true) -- wake_period defaults to 0.5 (see above)
+check_wake_duration(lanes.linda{name = "D", wake_period = 1}, 1, true)
+-- even when there is a wake_period, the operation should reach full timeout if not cancelled early
+check_wake_duration(lanes.linda{name = "E", wake_period = 0.1}, 2, false)
diff --git a/unit_tests/scripts/misc/deeptest.lua b/unit_tests/scripts/misc/deeptest.lua
new file mode 100644
index 0000000..542c35b
--- /dev/null
+++ b/unit_tests/scripts/misc/deeptest.lua
@@ -0,0 +1,161 @@
+local fixture = require "fixture"
+local lanes = require("lanes").configure{on_state_create = fixture.on_state_create}
+local l = lanes.linda{name = "my linda"}
+local table_unpack = table.unpack or unpack -- Lua 5.1 support
+-- we will transfer userdata created by this module, so we need to make Lanes aware of it
+local dt = lanes.require "deep_userdata_example"
+-- set DEEP to any non-false value to run the Deep Userdata tests. "gc" selects a special test for debug purposes
+DEEP = DEEP or true
+-- set CLONABLE to any non-false value to run the Clonable Userdata tests
+CLONABLE = CLONABLE or true
+-- lua 5.1->5.2 support a single table uservalue
+-- lua 5.3->5.4 supports an arbitrary type uservalue
+local test_uvtype = (_VERSION == "Lua 5.4") and "function" or (_VERSION == "Lua 5.3") and "string" or "table"
+-- lua 5.4 supports multiple uservalues
+local nupvals = _VERSION == "Lua 5.4" and 3 or 1
+local makeUserValue = function( obj_)
+        if test_uvtype == "table" then
+                return {"some uservalue"}
+        elseif test_uvtype == "string" then
+                return "some uservalue"
+        elseif test_uvtype == "function" then
+                -- a function that pull the userdata as upvalue
+                local f = function()
+                        return "-> '" .. tostring( obj_) .. "'"
+                end
+                return f
+        end
+end
+local printDeep = function( prefix_, obj_, t_)
+        print( prefix_, obj_)
+        for uvi = 1, nupvals do
+                local uservalue = obj_:getuv(uvi)
+                print ("uv #" .. uvi, type( uservalue), uservalue, type(uservalue) == "function" and uservalue() or "")
+        end
+        if t_ then
+                local count = 0
+                for k, v in ipairs( t_) do
+                        print( "t["..tostring(k).."]", v)
+                        count = count + 1
+                end
+                -- we should have only 2 indexed entries with the same value
+                assert(count == 2 and t_[1] == t_[2])
+        end
+        print()
+end
+local performTest = function( obj_)
+        -- setup the userdata with some value and a uservalue
+        obj_:set( 666)
+        obj_:setuv( 1, makeUserValue( obj_))
+        if nupvals > 1 then
+                -- keep uv #2 as nil
+                obj_:setuv( 3, "ENDUV")
+        end
+        local t =
+        {
+                -- two indices with an identical value: we should also have identical values on the other side (even if not the same as the original ones when they are clonables)
+                obj_,
+                obj_,
+                -- this one won't transfer because we don't support full uservalue as keys
+                [obj_] = "val"
+        }
+        -- read back the contents of the object
+        printDeep( "immediate:", obj_, t)
+        -- send the object in a linda, get it back out, read the contents
+        l:set( "key", obj_, t)
+        -- when obj_ is a deep userdata, out is the same userdata as obj_ (not another one pointing on the same deep memory block) because of an internal cache table [deep*] -> proxy)
+        -- when obj_ is a clonable userdata, we get a different clone everytime we cross a linda or lane barrier
+        local _n, _val1, _val2 = l:get( "key", 2)
+        assert(_n == (_val2 and 2 or 1))
+        printDeep( "out of linda:", _val1, _val2)
+        -- send the object in a lane through argument passing, the lane body returns it as return value, read the contents
+        local g = lanes.gen(
+                "package"
+                , {
+                        name = 'auto',
+                        required = { "deep_userdata_example"} -- we will transfer userdata created by this module, so we need to make this lane aware of it
+                }
+                , function( arg_, t_)
+                        -- read contents inside lane: arg_ and t_ by argument
+                        printDeep( "in lane, as arguments:", arg_, t_)
+                        -- read contents inside lane: obj_ and t by upvalue
+                        printDeep( "in lane, as upvalues:", obj_, t)
+                        -- read contents inside lane: in linda
+                        local _n, _val1, _val2 = l:get( "key", 2)
+                        assert(_n == (_val2 and 2 or 1))
+                        printDeep( "in lane, from linda:", _val1, _val2)
+                        return arg_, t_
+                end
+        )
+        h = g( obj_, t)
+        -- when obj_ is a deep userdata, from_lane is the same userdata as obj_ (not another one pointing on the same deep memory block) because of an internal cache table [deep*] -> proxy)
+        -- when obj_ is a clonable userdata, we get a different clone everytime we cross a linda or lane barrier
+        printDeep( "from lane:", h[1], h[2])
+end
+if DEEP then
+        print "================================================================"
+        print "DEEP"
+        local d = dt.new_deep(nupvals)
+        if type(DEEP) == "string" then
+                local gc_tests = {
+                        thrasher = function(repeat_, size_)
+                                print "in thrasher"
+                                -- result is a table of repeat_ tables, each containing size_ entries
+                                local result = {}
+                                for i = 1, repeat_ do
+                                        local batch_values = {}
+                                        for j = 1, size_ do
+                                                table.insert(batch_values, j)
+                                        end
+                                        table.insert(result, batch_values)
+                                end
+                                print "thrasher done"
+                                return result
+                        end,
+                        stack_abuser = function(repeat_, size_)
+                                print "in stack_abuser"
+                                for i = 1, repeat_ do
+                                        local batch_values = {}
+                                        for j = 1, size_ do
+                                                table.insert(batch_values, j)
+                                        end
+                                        -- return size_ values
+                                        local _ = table_unpack(batch_values)
+                                end
+                                print "stack_abuser done"
+                                return result
+                        end
+                }
+                -- have the object call the function from inside one of its functions, to detect if it gets collected from there (while in use!)
+                local testf = gc_tests[DEEP]
+                if testf then
+                        local r = d:invoke(gc_tests[DEEP], REPEAT or 10, SIZE or 10)
+                        print("invoke -> ", tostring(r))
+                else
+                        print("unknown test '" .. DEEP .. "'")
+                end
+        else
+                performTest(d)
+        end
+end
+if CLONABLE then
+        print "================================================================"
+        print "CLONABLE"
+        performTest( dt.new_clonable(nupvals))
+end
+print "================================================================"
+print "TEST OK"
+\ No newline at end of file
diff --git a/unit_tests/shared.cpp b/unit_tests/shared.cpp
index 2e2af73..9f3b08e 100644
--- a/unit_tests/shared.cpp
+++ b/unit_tests/shared.cpp
@@ -18,9 +18,9 @@ namespace
        {
            STACK_CHECK_START_REL(L_, 0);
            lua_getglobal(L_, "package");                                                          // L_: package
-            std::ignore = luaG_getfield(L_, kIdxTop, "preload");                                   // L_: package package.preload
+            std::ignore = luaW_getfield(L_, kIdxTop, "preload");                                   // L_: package package.preload
            lua_pushcfunction(L_, openf_);                                                         // L_: package package.preload openf_
-            luaG_setfield(L_, StackIndex{ -2 }, name_);                                            // L_: package package.preload
+            luaW_setfield(L_, StackIndex{ -2 }, name_);                                            // L_: package package.preload
            lua_pop(L_, 2);
            STACK_CHECK(L_, 0);
        }
@@ -32,7 +32,7 @@ namespace
        lua_CFunction sFreezingFinalizer = +[](lua_State* const L_) {
            std::lock_guard _guard{ sCallCountsLock };
            sFinalizerHits[L_].test_and_set();
-            luaG_pushstring(L_, "freeze"); // just freeze the thread in place so that it can be debugged
+            luaW_pushstring(L_, "freeze"); // just freeze the thread in place so that it can be debugged
            return 1;
        };
@@ -47,22 +47,22 @@ namespace
        };
        lua_CFunction sNewUserData = +[](lua_State* const L_) {
-            std::ignore = luaG_newuserdatauv<int>(L_, UserValueCount{ 0 });
+            std::ignore = luaW_newuserdatauv<int>(L_, UserValueCount{ 0 });
            return 1;
        };
-        // a function that enables any lane to require "fixture"
+        // a function that enables any lane to require "fixture" and "deep_userdata_example"
        lua_CFunction sOnStateCreate = +[](lua_State* const L_) {
            PreloadModule(L_, "fixture", luaopen_fixture);
            PreloadModule(L_, "deep_userdata_example", luaopen_deep_userdata_example);
            return 0;
        };
-        // a function that sleeps for the specified duration (in seconds)
+        // a function that blocks for the specified duration (in seconds) by putting the current thread to sleep
-        lua_CFunction sSleepFor = +[](lua_State* const L_) {
+        lua_CFunction sBlockFor = +[](lua_State* const L_) {
            std::chrono::time_point<std::chrono::steady_clock> _until{ std::chrono::time_point<std::chrono::steady_clock>::max() };
            lua_settop(L_, 1);
-            if (luaG_type(L_, kIdxTop) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
+            if (luaW_type(L_, kIdxTop) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
                lua_Duration const _duration{ lua_tonumber(L_, kIdxTop) };
                if (_duration.count() >= 0.0) {
                    _until = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(_duration);
@@ -82,17 +82,17 @@ namespace
            std::lock_guard _guard{ sCallCountsLock };
            sFinalizerHits[L_].test_and_set();
            bool const _allLanesTerminated = lua_toboolean(L_, kIdxTop);
-            luaG_pushstring(L_, "Finalizer%s", _allLanesTerminated ? "" : ": Uncooperative lanes detected");
+            luaW_pushstring(L_, "Finalizer%s", _allLanesTerminated ? "" : ": Uncooperative lanes detected");
            return 1;
        };
        static luaL_Reg const sFixture[] = {
            { "freezing_finalizer", sFreezingFinalizer },
-            { "give_me_back()", sGiveMeBack },
+            { "give_me_back", sGiveMeBack },
            { "newlightuserdata", sNewLightUserData },
            { "newuserdata", sNewUserData },
            { "on_state_create", sOnStateCreate },
-            { "sleep_for", sSleepFor },
+            { "block_for", sBlockFor },
            { "throwing_finalizer", sThrowingFinalizer },
            { nullptr, nullptr }
        };
@@ -103,7 +103,7 @@ namespace
    int luaopen_fixture(lua_State* L_)
    {
        STACK_CHECK_START_REL(L_, 0);
-        luaG_newlib<std::size(local::sFixture)>(L_, local::sFixture);                              // M
+        luaW_newlib<std::size(local::sFixture)>(L_, local::sFixture);                              // M
        STACK_CHECK(L_, 1);
        return 1;
    }
@@ -246,7 +246,7 @@ LuaError LuaState::doString(std::string_view const& str_) const
        return _loadErr;
    }
    LuaError const _callErr{ lua_pcall(L, 0, 1, 0) };                                              // L: "<msg>"?
-    [[maybe_unused]] std::string_view const _out{ luaG_tostring(L, kIdxTop) };
+    [[maybe_unused]] std::string_view const _out{ luaW_tostring(L, kIdxTop) };
    STACK_CHECK(L, 1);
    return _callErr;
 }
@@ -257,8 +257,8 @@ std::string_view LuaState::doStringAndRet(std::string_view const& str_) const
 {
    lua_settop(L, 0);
    if (str_.empty()) {
-        luaG_pushstring(L, "");
+        luaW_pushstring(L, "");
-        return luaG_tostring(L, kIdxTop);
+        return luaW_tostring(L, kIdxTop);
    }
    STACK_CHECK_START_REL(L, 0);
    LuaError const _loadErr{ luaL_loadstring(L, str_.data()) };                                    // L: chunk()
@@ -268,7 +268,7 @@ std::string_view LuaState::doStringAndRet(std::string_view const& str_) const
    }
    [[maybe_unused]] LuaError const _callErr{ lua_pcall(L, 0, 1, 0) };                             // L: "<msg>"?|retstring
    STACK_CHECK(L, 1);
-    return luaG_tostring(L, kIdxTop);
+    return luaW_tostring(L, kIdxTop);
 }
 // #################################################################################################
@@ -336,7 +336,7 @@ void LuaState::requireFailure(std::string_view const& script_)
 {
    auto const _result{ doString(script_) };
    if (_result == LuaError::OK) {
-        WARN(luaG_tostring(L, kIdxTop));
+        WARN(luaW_tostring(L, kIdxTop));
    }
    REQUIRE(_result != LuaError::OK);
    lua_settop(L, 0);
@@ -372,7 +372,7 @@ void LuaState::requireSuccess(std::string_view const& script_)
 {
    auto const _result{ doString(script_) };
    if (_result != LuaError::OK) {
-        WARN(luaG_tostring(L, kIdxTop));
+        WARN(luaW_tostring(L, kIdxTop));
    }
    REQUIRE(_result == LuaError::OK);
    lua_settop(L, 0);
@@ -384,7 +384,7 @@ void LuaState::requireSuccess(std::filesystem::path const& root_, std::string_vi
 {
    auto const _result{ doFile(root_, path_) };
    if (_result != LuaError::OK) {
-        WARN(luaG_tostring(L, kIdxTop));
+        WARN(luaW_tostring(L, kIdxTop));
    }
    REQUIRE(_result == LuaError::OK);
    lua_settop(L, 0);
@@ -407,20 +407,20 @@ TEST_CASE("LuaState.doString")
 {
    LuaState _L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // if the script fails to load, we should find the error message at the top of the stack
-    REQUIRE([&L = _L]() { std::ignore = L.doString("function end"); return lua_gettop(L) == 1 && luaG_type(L, StackIndex{1}) == LuaType::STRING; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("function end"); return lua_gettop(L) == 1 && luaW_type(L, StackIndex{1}) == LuaType::STRING; }());
    // if the script runs, the stack should contain its return value
-    REQUIRE([&L = _L]() { std::ignore = L.doString("return true"); return lua_gettop(L) == 1 && luaG_type(L, StackIndex{1}) == LuaType::BOOLEAN; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("return true"); return lua_gettop(L) == 1 && luaW_type(L, StackIndex{1}) == LuaType::BOOLEAN; }());
-    REQUIRE([&L = _L]() { std::ignore = L.doString("return 'hello'"); return lua_gettop(L) == 1 && luaG_tostring(L, StackIndex{1}) == "hello"; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("return 'hello'"); return lua_gettop(L) == 1 && luaW_tostring(L, StackIndex{1}) == "hello"; }());
    // or nil if it didn't return anything
-    REQUIRE([&L = _L]() { std::ignore = L.doString("return"); return lua_gettop(L) == 1 && luaG_type(L, StackIndex{1}) == LuaType::NIL; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("return"); return lua_gettop(L) == 1 && luaW_type(L, StackIndex{1}) == LuaType::NIL; }());
    // on failure, doStringAndRet returns "", and the error message is on the stack
-    REQUIRE([&L = _L]() { return L.doStringAndRet("function end") == "" && lua_gettop(L) == 1 && luaG_type(L, StackIndex{ 1 }) == LuaType::STRING && luaG_tostring(L, StackIndex{ 1 }) != ""; }());
+    REQUIRE([&L = _L]() { return L.doStringAndRet("function end") == "" && lua_gettop(L) == 1 && luaW_type(L, StackIndex{ 1 }) == LuaType::STRING && luaW_tostring(L, StackIndex{ 1 }) != ""; }());
    // on success doStringAndRet returns the string returned by the script, that is also at the top of the stack
-    REQUIRE([&L = _L]() { return L.doStringAndRet("return 'hello'") == "hello" && lua_gettop(L) == 1 && luaG_type(L, StackIndex{ 1 }) == LuaType::STRING && luaG_tostring(L, StackIndex{ 1 }) == "hello"; }());
+    REQUIRE([&L = _L]() { return L.doStringAndRet("return 'hello'") == "hello" && lua_gettop(L) == 1 && luaW_type(L, StackIndex{ 1 }) == LuaType::STRING && luaW_tostring(L, StackIndex{ 1 }) == "hello"; }());
    // if the returned value is not (convertible to) a string, we should get an empty string out of doStringAndRet
-    REQUIRE([&L = _L]() { return L.doStringAndRet("return function() end") == "" && lua_gettop(L) == 1 && luaG_type(L, StackIndex{ 1 }) == LuaType::FUNCTION && luaG_tostring(L, StackIndex{ 1 }) == ""; }());
+    REQUIRE([&L = _L]() { return L.doStringAndRet("return function() end") == "" && lua_gettop(L) == 1 && luaW_type(L, StackIndex{ 1 }) == LuaType::FUNCTION && luaW_tostring(L, StackIndex{ 1 }) == ""; }());
 }
 // #################################################################################################
@@ -436,9 +436,9 @@ FileRunner::FileRunner(std::string_view const& where_)
    // because the VS Test Explorer doesn't appreciate the text output of some scripts, so absorb them
    if constexpr (1) {
        auto const _nullprint = +[](lua_State* const L_) { return 0; };
-        luaG_pushglobaltable(L);
+        luaW_pushglobaltable(L);
        lua_pushcfunction(L, _nullprint);
-        luaG_setfield(L, StackIndex{ -2 }, std::string_view{ "print" });
+        luaW_setfield(L, StackIndex{ -2 }, std::string_view{ "print" });
        lua_pop(L, 1);
        stackCheck(0);
    }
@@ -476,6 +476,7 @@ void FileRunner::performTest(FileRunnerParam const& testParam_)
    INFO(testParam_.script);
    switch (testParam_.test) {
    case TestType::AssertNoLuaError:
+        lua_atpanic(L, _atPanic);
        requireSuccess(root, testParam_.script);
        break;
diff --git a/unit_tests/shared.h b/unit_tests/shared.h
index b884df0..c6c3339 100644
--- a/unit_tests/shared.h
+++ b/unit_tests/shared.h
@@ -56,7 +56,7 @@ class LuaState
    friend std::ostream& operator<<(std::ostream& os_, LuaState const& s_)
    {
-        os_ << luaG_tostring(s_.L, kIdxTop);
+        os_ << luaW_tostring(s_.L, kIdxTop);
        return os_;
    }
 };