- Removed wrap_diameterd and used PYPE:FORK with a regular expression
 - Discovered that \s combines uglyly with CMake / CTest phases; double escapes?!?
 - Collapsed a lot of standard configuration into test macro set()tings