1583 files changed, 2997 insertions, 3004 deletions

diff --git a/Makefile.am b/Makefile.am
index 4532c7eb..fcbebd3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ tetexec.cfg:
 
 # Helper target for testing subsets
 test-%:
-	@cd xts5/tset && $(MAKE) $(AM_MAKEFLAGS) $@
+	@cd xts5 && $(MAKE) $(AM_MAKEFLAGS) $@
 
 logfile:
 	cd xts5 && $(MAKE) logfile
diff --git a/configure.ac b/configure.ac
index affa90f3..cc557712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,26 +117,25 @@ xts5/src/xim/Makefile
 xts5/src/bin/Makefile
 xts5/src/bin/mc/Makefile
 xts5/fonts/Makefile
-xts5/tset/Makefile
-xts5/tset/Xproto/Makefile
-xts5/tset/Xopen/Makefile
-xts5/tset/Xlib3/Makefile
-xts5/tset/Xlib4/Makefile
-xts5/tset/Xlib5/Makefile
-xts5/tset/Xlib6/Makefile
-xts5/tset/Xlib7/Makefile
-xts5/tset/Xlib8/Makefile
-xts5/tset/Xlib9/Makefile
-xts5/tset/Xlib10/Makefile
-xts5/tset/Xlib11/Makefile
-xts5/tset/Xlib12/Makefile
-xts5/tset/Xlib13/Makefile
-xts5/tset/Xlib14/Makefile
-xts5/tset/Xlib15/Makefile
-xts5/tset/Xlib16/Makefile
-xts5/tset/Xlib17/Makefile
-xts5/tset/XIproto/Makefile
-xts5/tset/XI/Makefile
+xts5/Xproto/Makefile
+xts5/Xopen/Makefile
+xts5/Xlib3/Makefile
+xts5/Xlib4/Makefile
+xts5/Xlib5/Makefile
+xts5/Xlib6/Makefile
+xts5/Xlib7/Makefile
+xts5/Xlib8/Makefile
+xts5/Xlib9/Makefile
+xts5/Xlib10/Makefile
+xts5/Xlib11/Makefile
+xts5/Xlib12/Makefile
+xts5/Xlib13/Makefile
+xts5/Xlib14/Makefile
+xts5/Xlib15/Makefile
+xts5/Xlib16/Makefile
+xts5/Xlib17/Makefile
+xts5/XIproto/Makefile
+xts5/XI/Makefile
 ])
 
 AC_OUTPUT
diff --git a/xts5/.gitignore b/xts5/.gitignore
index af9e77b7..0fdb1ee2 100644
--- a/xts5/.gitignore
+++ b/xts5/.gitignore
@@ -1,2 +1,9 @@
-tetexec.cfg
+*.c
+*.err
+*.log
+*.log.tmp
+.dirstamp
 results
+tet_lock
+tet_xres
+tetexec.cfg
diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 53c51e39..3224a0bf 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -1,6 +1,6 @@
 include common.mk
 
-SUBDIRS = . src fonts tset scenarios
+SUBDIRS = . src fonts scenarios
 
 xts5_DATA = tetexec.cfg tet_scen
 xts5dir = $(datadir)/xts5
@@ -13,6 +13,850 @@ XTS_CONFIG = TET_ROOT='$(TET_ROOT)' DISPLAY='$(XT_DISPLAY)' \
 tetexec.cfg: tetexec.cfg.in $(srcdir)/bin/xts-config Makefile
 	$(XTS_CONFIG) < $< > $@ || rm -f $@
 
-logfile:
-	cd tset && $(MAKE) logfile
+SUBDIRS += Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 Xlib7 Xlib8 Xlib9 Xlib10 \
+	Xlib11 Xlib12 Xlib13 Xlib14 Xlib15 Xlib16 Xlib17 XIproto XI
+
+CLEANFILES = */*/tet_lock
+LOGFILES = */*/*.log
+DISTCLEANFILES = $(LOGFILES) */*/*.log.tmp
+
+.PHONY: $(TESTS)
+# Skip Xopen_TESTS for now since they mangle keymap
+TESTS = $(Xproto_TESTS) $(Xlib3_TESTS) $(Xlib4_TESTS) $(Xlib5_TESTS) \
+	$(Xlib6_TESTS) $(Xlib7_TESTS) $(Xlib8_TESTS) $(Xlib9_TESTS) \
+	$(Xlib10_TESTS) $(Xlib11_TESTS) $(Xlib12_TESTS) $(Xlib13_TESTS) \
+	$(Xlib14_TESTS) $(Xlib15_TESTS) $(Xlib16_TESTS) $(Xlib17_TESTS) \
+	$(XIproto_TESTS) $(XI_TESTS)
+
+# Helpful pattern target for testing subsets (test-Xopen, etc.)
+test-%:
+	@$(MAKE) $(AM_MAKEFLAGS) check TESTS='$($*_TESTS)'
+
+Xproto_TESTS = \
+	pAllocColor \
+	pAllocColorCells \
+	pAllocColorPlanes \
+	pAllocNamedColor \
+	pAllowEvents \
+	pBadRequest \
+	pBell \
+	pChangeActivePointerGrab \
+	pChangeGC \
+	pChangeHosts \
+	pChangeKeyboardControl \
+	pChangeKeyboardMapping \
+	pChangePointerControl \
+	pChangeProperty \
+	pChangeSaveSet \
+	pChangeWindowAttributes \
+	pClearArea \
+	pCloseFont \
+	pConfigureWindow \
+	pConvertSelection \
+	pCopyArea \
+	pCopyColormapAndFree \
+	pCopyGC \
+	pCopyPlane \
+	pCirculateWindow \
+	pCreateColormap \
+	pCreateCursor \
+	pCreateGC \
+	pCreateGlyphCursor \
+	pCreatePixmap \
+	pCreateWindow \
+	pDeleteProperty \
+	pDestroySubwindows \
+	pDestroyWindow \
+	pFillPoly \
+	pFreeColormap \
+	pFreeColors \
+	pFreeCursor \
+	pForceScreenSaver \
+	pFreeGC \
+	pFreePixmap \
+	pGrabButton \
+	pGrabKey \
+	pGrabKeyboard \
+	pGrabPointer \
+	pGrabServer \
+	pGetAtomName \
+	pGetFontPath \
+	pGetGeometry \
+	pGetImage \
+	pGetInputFocus \
+	pGetKeyboardControl \
+	pGetKeyboardMapping \
+	pGetModifierMapping \
+	pGetMotionEvents \
+	pGetPointerControl \
+	pGetPointerMapping \
+	pGetProperty \
+	pGetScreenSaver \
+	pGetSelectionOwner \
+	pGetWindowAttributes \
+	pImageText16 \
+	pImageText8 \
+	pInstallColormap \
+	pInternAtom \
+	pKillClient \
+	pLookupColor \
+	pListExtensions \
+	pListFonts \
+	pListFontsWithInfo \
+	pListHosts \
+	pListInstalledColormaps \
+	pListProperties \
+	pMapSubwindows \
+	pMapWindow \
+	pNoOperation \
+	pOpenDisplay \
+	pOpenFont \
+	pPolyArc \
+	pPolyFillArc \
+	pPolyFillRectangle \
+	pPolyLine \
+	pPolyPoint \
+	pPolyRectangle \
+	pPolySegment \
+	pPolyText16 \
+	pPolyText8 \
+	pPutImage \
+	pQueryBestSize \
+	pQueryColors \
+	pQueryExtension \
+	pQueryFont \
+	pQueryKeymap \
+	pQueryPointer \
+	pQueryTree \
+	pQueryTextExtents \
+	pRecolorCursor \
+	pReparentWindow \
+	pRotateProperties \
+	pSendEvent \
+	pSetAccessControl \
+	pSetClipRectangles \
+	pSetCloseDownMode \
+	pSetDashes \
+	pSetFontPath \
+	pSetInputFocus \
+	pSetModifierMapping \
+	pSetPointerMapping \
+	pStoreColors \
+	pStoreNamedColor \
+	pSetScreenSaver \
+	pSetSelectionOwner \
+	pTranslateCoords \
+	pUngrabButton \
+	pUngrabKey \
+	pUngrabKeyboard \
+	pUngrabPointer \
+	pUngrabServer \
+	pUnmapSubwindows \
+	pUnmapWindow \
+	pUninstallColormap \
+	pWarpPointer
+
+Xopen_TESTS = \
+	xXAllocNamedColor \
+	xcursorfont \
+	xXCreateFontCursor \
+	xkeysym \
+	xkeysymdef \
+	xXKeysymToKeycode \
+	xXLookupColor \
+	xXStringToKeysym
+
+Xlib3_TESTS = \
+	XAllPlanes \
+	XBlackPixel \
+	BlackPixel \
+	XBlackPixelOfScreen \
+	BlackPixelOfScreen \
+	XBitmapBitOrder \
+	BitmapBitOrder \
+	XBitmapPad \
+	BitmapPad \
+	XBitmapUnit \
+	BitmapUnit \
+	XCellsOfScreen \
+	CellsOfScreen \
+	XCloseDisplay \
+	XConnectionNumber \
+	ConnectionNumber \
+	XDefaultColormap \
+	DefaultColormap \
+	XDefaultColormapOfScreen \
+	DefaultColormapOfScreen \
+	XDefaultDepth \
+	DefaultDepth \
+	XDefaultDepthOfScreen \
+	DefaultDepthOfScreen \
+	XDefaultGC \
+	DefaultGC \
+	XDefaultGCOfScreen \
+	DefaultGCOfScreen \
+	XDefaultRootWindow \
+	DefaultRootWindow \
+	XDefaultScreen \
+	DefaultScreen \
+	XDefaultScreenOfDisplay \
+	DefaultScreenOfDisplay \
+	XDefaultVisual \
+	DefaultVisual \
+	XDefaultVisualOfScreen \
+	DefaultVisualOfScreen \
+	XDoesBackingStore \
+	DoesBackingStore \
+	XDisplayCells \
+	DisplayCells \
+	XDisplayHeight \
+	DisplayHeight \
+	XDisplayHeightMM \
+	DisplayHeightMM \
+	XDisplayOfScreen \
+	DisplayOfScreen \
+	XDisplayPlanes \
+	DisplayPlanes \
+	XDisplayString \
+	DisplayString \
+	XDisplayWidth \
+	DisplayWidth \
+	XDisplayWidthMM \
+	DisplayWidthMM \
+	XDoesSaveUnders \
+	DoesSaveUnders \
+	XEventMaskOfScreen \
+	EventMaskOfScreen \
+	XFree \
+	XHeightMMOfScreen \
+	HeightMMOfScreen \
+	XHeightOfScreen \
+	HeightOfScreen \
+	XImageByteOrder \
+	ImageByteOrder \
+	XListDepths \
+	XLastKnownRequestProcessed \
+	LastKnownRequestProcessed \
+	XListPixmapFormats \
+	XMinCmapsOfScreen \
+	MinCmapsOfScreen \
+	XMaxCmapsOfScreen \
+	MaxCmapsOfScreen \
+	XNoOp \
+	XNextRequest \
+	NextRequest \
+	XOpenDisplay \
+	XPlanesOfScreen \
+	PlanesOfScreen \
+	XProtocolRevision \
+	ProtocolRevision \
+	XProtocolVersion \
+	ProtocolVersion \
+	XQLength \
+	QLength \
+	XRootWindow \
+	RootWindow \
+	XRootWindowOfScreen \
+	RootWindowOfScreen \
+	XScreenCount \
+	ScreenCount \
+	XScreenNumberOfScreen \
+	XScreenOfDisplay \
+	ScreenOfDisplay \
+	XServerVendor \
+	ServerVendor \
+	XSetCloseDownMode \
+	XVendorRelease \
+	VendorRelease \
+	XWidthMMOfScreen \
+	WidthMMOfScreen \
+	XWidthOfScreen \
+	WidthOfScreen \
+	XWhitePixel \
+	WhitePixel \
+	XWhitePixelOfScreen \
+	WhitePixelOfScreen
+
+Xlib4_TESTS = \
+	XChangeWindowAttributes \
+	XConfigureWindow \
+	XCirculateSubwindows \
+	XCirculateSubwindowsDown \
+	XCirculateSubwindowsUp \
+	XCreateSimpleWindow \
+	XCreateWindow \
+	XDefineCursor \
+	XDestroySubwindows \
+	XDestroyWindow \
+	XLowerWindow \
+	XMapRaised \
+	XMapSubwindows \
+	XMapWindow \
+	XMoveResizeWindow \
+	XMoveWindow \
+	XRestackWindows \
+	XRaiseWindow \
+	XResizeWindow \
+	XSetWindowBackground \
+	XSetWindowBackgroundPixmap \
+	XSetWindowBorder \
+	XSetWindowBorderPixmap \
+	XSetWindowBorderWidth \
+	XSetWindowColormap \
+	XUndefineCursor \
+	XUnmapSubwindows \
+	XUnmapWindow \
+	XVisualIDFromVisual
+
+Xlib5_TESTS = \
+	XChangeProperty \
+	XConvertSelection \
+	XDeleteProperty \
+	XGetAtomName \
+	XGetGeometry \
+	XGetSelectionOwner \
+	XGetWindowAttributes \
+	XGetWindowProperty \
+	XInternAtom \
+	XListProperties \
+	XQueryPointer \
+	XQueryTree \
+	XRotateWindowProperties \
+	XSetSelectionOwner \
+	XTranslateCoordinates
+
+Xlib6_TESTS = \
+	XCreatePixmap \
+	XCreateFontCursor \
+	XCreateGlyphCursor \
+	XCreatePixmapCursor \
+	XFreeCursor \
+	XFreePixmap \
+	XQueryBestCursor \
+	XRecolorCursor
+
+Xlib7_TESTS = \
+	XAllocColor \
+	XAllocColorCells \
+	XAllocColorPlanes \
+	XAllocNamedColor \
+	XCopyColormapAndFree \
+	XCreateColormap \
+	XFreeColormap \
+	XFreeColors \
+	XLookupColor \
+	XParseColor \
+	XQueryColor \
+	XQueryColors \
+	XStoreColor \
+	XStoreColors \
+	XStoreNamedColor \
+	XcmsAllocColor \
+	XcmsAddColorSpace \
+	XcmsAddFunctionSet \
+	XcmsAllocNamedColor \
+	XcmsCCCOfColormap \
+	XcmsConvertColors \
+	XcmsCIELabQueryMaxLC \
+	XcmsCIELabQueryMaxC \
+	XcmsCIELabQueryMaxL \
+	XcmsConversionProc \
+	XcmsConversionProc \
+	XcmsCreateCCC \
+	XcmsDefaultCCC \
+	XcmsDisplayOfCCC \
+	XcmsFreeCCC \
+	XcmsFormatOfPrefix \
+	XcmsLookupColor \
+	XcmsCIELabQueryMinL \
+	XcmsPrefixOfFormat \
+	XcmsQueryBlack \
+	XcmsQueryBlue \
+	XcmsQueryColor \
+	XcmsQueryColors \
+	XcmsQueryGreen \
+	XcmsCIELuvQueryMaxC \
+	XcmsCIELuvQueryMinL \
+	XcmsCIELuvQueryMaxL \
+	XcmsCIELuvQueryMaxLC \
+	XcmsQueryRed \
+	XcmsQueryWhite \
+	XcmsScreenNumberOfCCC \
+	XcmsStoreColor \
+	XcmsStoreColors \
+	XcmsTekHVCQueryMaxC \
+	XcmsTekHVCQueryMinV \
+	XcmsTekHVCQueryMaxV \
+	XcmsTekHVCQueryMaxVC \
+	XcmsTekHVCQueryMaxVSamples \
+	XcmsVisualOfCCC \
+	XcmsSetWhiteAdjustProc \
+	XcmsScreenWhitePointOfCCC \
+	XcmsClientWhitePointOfCCC \
+	XcmsSetWhitePoint
+
+Xlib8_TESTS = \
+	XChangeGC \
+	XCopyGC \
+	XCreateGC \
+	XFreeGC \
+	XGContextFromGC \
+	XGetGCValues \
+	XQueryBestStipple \
+	XQueryBestSize \
+	XQueryBestTile \
+	XSetArcMode \
+	XSetBackground \
+	XSetClipMask \
+	XSetClipOrigin \
+	XSetClipRectangles \
+	XSetDashes \
+	XSetFillRule \
+	XSetFillStyle \
+	XSetFunction \
+	XSetFont \
+	XSetForeground \
+	XSetGraphicsExposures \
+	XSetLineAttributes \
+	XSetPlaneMask \
+	XSetSubwindowMode \
+	XSetStipple \
+	XSetState \
+	XSetTile \
+	XSetTSOrigin \
+	XFlushGC
 
+Xlib9_TESTS = \
+	XClearArea \
+	XClearWindow \
+	XCopyArea \
+	XCopyPlane \
+	XDrawArc \
+	XDrawArcs \
+	XDrawImageString16 \
+	XDrawImageString \
+	XDrawLine \
+	XDrawLines \
+	XDrawPoint \
+	XDrawPoints \
+	XDrawRectangle \
+	XDrawRectangles \
+	XDrawSegments \
+	XDrawString \
+	XDrawString16 \
+	XDrawText \
+	XDrawText16 \
+	XFillArc \
+	XFillArcs \
+	XFillPolygon \
+	XFillRectangle \
+	XFillRectangles \
+	XFreeFont \
+	XFreeFontInfo \
+	XFreeFontNames \
+	XFreeFontPath \
+	XGetFontProperty \
+	XGetFontPath \
+	XGetImage \
+	XGetSubImage \
+	XLoadFont \
+	XLoadQueryFont \
+	XListFonts \
+	XListFontsWithInfo \
+	XPutImage \
+	XQueryFont \
+	XQueryTextExtents16 \
+	XQueryTextExtents \
+	XSetFontPath \
+	XTextExtents16 \
+	XTextExtents \
+	XTextWidth \
+	XTextWidth16 \
+	XUnloadFont
+
+Xlib10_TESTS = \
+	XActivateScreenSaver \
+	XAddHost \
+	XAddHosts \
+	XAddToSaveSet \
+	XChangeSaveSet \
+	XDisableAccessControl \
+	XEnableAccessControl \
+	XForceScreenSaver \
+	XGrabServer \
+	XGetScreenSaver \
+	XInstallColormap \
+	XKillClient \
+	XListHosts \
+	XListInstalledColormaps \
+	XRemoveFromSaveSet \
+	XRemoveHost \
+	XRemoveHosts \
+	XReparentWindow \
+	XResetScreenSaver \
+	XSetAccessControl \
+	XSetScreenSaver \
+	XUngrabServer \
+	XUninstallColormap
+
+Xlib11_TESTS = \
+	ButtonPress \
+	ButtonRelease \
+	ClientMessage \
+	ColormapNotify \
+	ConfigureNotify \
+	ConfigureRequest \
+	CirculateNotify \
+	CirculateRequest \
+	CreateNotify \
+	DestroyNotify \
+	EnterNotify \
+	Expose \
+	FocusIn \
+	FocusOut \
+	GraphicsExpose \
+	GravityNotify \
+	KeymapNotify \
+	KeyPress \
+	KeyRelease \
+	LeaveNotify \
+	MapNotify \
+	MappingNotify \
+	MapRequest \
+	MotionNotify \
+	NoExpose \
+	PropertyNotify \
+	ReparentNotify \
+	ResizeRequest \
+	SelectionClear \
+	SelectionNotify \
+	SelectionRequest \
+	UnmapNotify \
+	VisibilityNotify
+
+Xlib12_TESTS = \
+	XCheckIfEvent \
+	XCheckMaskEvent \
+	XCheckTypedEvent \
+	XCheckTypedWindowEvent \
+	XCheckWindowEvent \
+	XDisplayMotionBufferSize \
+	XDisplayName \
+	XEventsQueued \
+	XFlush \
+	XGetErrorDatabaseText \
+	XGetErrorText \
+	XGetMotionEvents \
+	XIfEvent \
+	XMaskEvent \
+	XNextEvent \
+	XPeekEvent \
+	XPeekIfEvent \
+	XPending \
+	XPutBackEvent \
+	XSelectInput \
+	XSendEvent \
+	XSetAfterFunction \
+	XSetErrorHandler \
+	XSetIOErrorHandler \
+	XSync \
+	XSynchronize \
+	XWindowEvent
+
+Xlib13_TESTS = \
+	XAllowEvents \
+	XAutoRepeatOff \
+	XAutoRepeatOn \
+	XBell \
+	XChangeActivePointerGrab \
+	XChangeKeyboardControl \
+	XChangeKeyboardMapping \
+	XChangePointerControl \
+	XDeleteModifiermapEntry \
+	XDisplayKeycodes \
+	XFreeModifiermap \
+	XGrabButton \
+	XGrabKey \
+	XGrabKeyboard \
+	XGrabPointer \
+	XGetInputFocus \
+	XGetKeyboardControl \
+	XGetKeyboardMapping \
+	XGetModifierMapping \
+	XGetPointerControl \
+	XGetPointerMapping \
+	XInsertModifiermapEntry \
+	XNewModifiermap \
+	XQueryKeymap \
+	XSetInputFocus \
+	XSetModifierMapping \
+	XSetPointerMapping \
+	XUngrabButton \
+	XUngrabKey \
+	XUngrabKeyboard \
+	XUngrabPointer \
+	XWarpPointer
+
+Xlib14_TESTS = \
+	XBaseFontNameListOfFontSet \
+	XCloseIM \
+	XContextDependentDrawing \
+	XCreateFontSet \
+	XCreateIC \
+	XDestroyIC \
+	XDisplayOfIM \
+	XExtentsOfFontSet \
+	XFilterEvent \
+	XFontsOfFontSet \
+	XFreeFontSet \
+	XGetICValues \
+	XGetIMValues \
+	XIMOfIC \
+	XLocaleOfFontSet \
+	XLocaleOfIM \
+	XmbDrawImageString \
+	XmbDrawString \
+	XmbDrawText \
+	XmbLookupString \
+	XmbResetIC \
+	XmbSetWMProperties \
+	XmbTextEscapement \
+	XmbTextExtents \
+	XmbTextListToTextProperty \
+	XmbTextPerCharExtents \
+	XmbTextPropertyToTextList \
+	XOpenIM \
+	XSetICFocus \
+	XSetICValues \
+	XSupportsLocale \
+	XSetLocaleModifiers \
+	XUnsetICFocus \
+	XVaCreateNestedList \
+	XwcDrawImageString \
+	XwcDrawString \
+	XwcDrawText \
+	XwcFreeStringList \
+	XwcLookupString \
+	XwcResetIC \
+	XwcTextEscapement \
+	XwcTextListToTextProperty \
+	XwcTextPerCharExtents \
+	XwcTextPropertyToTextList \
+	XwcTextExtents
+
+Xlib15_TESTS = \
+	XAllocClassHint \
+	XAllocIconSize \
+	XAllocStandardColormap \
+	XAllocSizeHints \
+	XAllocWMHints \
+	XFreeStringList \
+	XFetchName \
+	XGetClassHint \
+	XGetCommand \
+	XGetIconName \
+	XGetIconSizes \
+	XGetRGBColormaps \
+	XGetTransientForHint \
+	XGetTextProperty \
+	XGetWMClientMachine \
+	XGetWMColormapWindows \
+	XGetWMHints \
+	XGetWMIconName \
+	XGetWMName \
+	XGetWMNormalHints \
+	XGetWMProtocols \
+	XGetWMSizeHints \
+	XIconifyWindow \
+	XReconfigureWMWindow \
+	XSetClassHint \
+	XSetCommand \
+	XSetIconName \
+	XSetIconSizes \
+	XSetRGBColormaps \
+	XStringListToTextProperty \
+	XStoreName \
+	XSetTransientForHint \
+	XSetTextProperty \
+	XSetWMClientMachine \
+	XSetWMColormapWindows \
+	XSetWMHints \
+	XSetWMIconName \
+	XSetWMName \
+	XSetWMNormalHints \
+	XSetWMProperties \
+	XSetWMProtocols \
+	XSetWMSizeHints \
+	XTextPropertyToStringList \
+	XWithdrawWindow \
+	XDefaultString
+
+Xlib16_TESTS = \
+	XrmDestroyDatabase \
+	XrmGetFileDatabase \
+	XrmGetResource \
+	XrmGetStringDatabase \
+	XrmInitialize \
+	XrmMergeDatabases \
+	XrmParseCommand \
+	XrmPutFileDatabase \
+	XrmPutLineResource \
+	XrmPutResource \
+	XrmPutStringResource \
+	XrmQGetResource \
+	XrmQGetSearchList \
+	XrmQGetSearchResource \
+	XrmQPutResource \
+	XrmQPutStringResource \
+	XrmQuarkToString \
+	XrmStringToBindingQuarkList \
+	XrmStringToQuark \
+	XrmStringToQuarkList \
+	XrmUniqueQuark \
+	XResourceManagerString \
+	XrmCombineDatabase \
+	XrmCombineFileDatabase \
+	XrmEnumerateDatabase \
+	XrmGetDatabase \
+	XrmLocaleOfDatabase \
+	XrmPermStringToQuark \
+	XrmSetDatabase \
+	XScreenResourceString
+
+Xlib17_TESTS = \
+	XAddPixel \
+	XClipBox \
+	XCreateBitmapFromData \
+	XCreateImage \
+	XCreatePixmapFromBitmapData \
+	XCreateRegion \
+	XDeleteContext \
+	XDestroyImage \
+	XDestroyRegion \
+	XEmptyRegion \
+	XEqualRegion \
+	XFindContext \
+	XFetchBuffer \
+	XFetchBytes \
+	XGetDefault \
+	XGetPixel \
+	XGetVisualInfo \
+	XIntersectRegion \
+	IsCursorKey \
+	IsFunctionKey \
+	IsKeypadKey \
+	IsModifierKey \
+	IsMiscFunctionKey \
+	IsPFKey \
+	XKeycodeToKeysym \
+	XKeysymToKeycode \
+	XKeysymToString \
+	XLookupKeysym \
+	XLookupString \
+	XMatchVisualInfo \
+	XOffsetRegion \
+	XPolygonRegion \
+	XPointInRegion \
+	Xpermalloc \
+	XParseGeometry \
+	XPutPixel \
+	XRebindKeysym \
+	XRectInRegion \
+	XReadBitmapFile \
+	XRefreshKeyboardMapping \
+	XRotateBuffers \
+	XSubImage \
+	XSubtractRegion \
+	XShrinkRegion \
+	XStoreBuffer \
+	XStoreBytes \
+	XSetRegion \
+	XStringToKeysym \
+	XSaveContext \
+	XUnionRectWithRegion \
+	XUnionRegion \
+	XUniqueContext \
+	XWMGeometry \
+	XWriteBitmapFile \
+	XXorRegion
+
+XIproto_TESTS = \
+	AllowDeviceEvents \
+	ChangeDeviceControl \
+	ChangeDeviceDontPropagateList \
+	ChangeFeedbackControl \
+	ChangeKeyboardDevice \
+	ChangePointerDevice \
+	ChangeDeviceKeyMapping \
+	CloseDevice \
+	DeviceBell \
+	GetDeviceModifierMapping \
+	GetFeedbackControl \
+	GetExtensionVersion \
+	GrabDevice \
+	GrabDeviceButton \
+	GrabDeviceKey \
+	GetDeviceButtonMapping \
+	GetDeviceControl \
+	GetDeviceFocus \
+	GetDeviceMotionEvents \
+	GetDeviceDontPropagateList \
+	GetDeviceKeyMapping \
+	GetSelectedExtensionEvents \
+	ListInputDevices \
+	OpenDevice \
+	QueryDeviceState \
+	SetDeviceValuators \
+	SetDeviceButtonMapping \
+	SetDeviceFocus \
+	SetDeviceModifierMapping \
+	SetDeviceMode \
+	SelectExtensionEvent \
+	SendExtensionEvent \
+	UngrabDevice \
+	UngrabDeviceButton \
+	UngrabDeviceKey
+
+XI_TESTS = \
+	XAllowDeviceEvents \
+	XChangeDeviceControl \
+	XChangeFeedbackControl \
+	XChangeKeyboardDevice \
+	XChangeDeviceDontPropagateList \
+	XChangePointerDevice \
+	XChangeDeviceKeyMapping \
+	XCloseDevice \
+	XDeviceBell \
+	XGetDeviceControl \
+	XGetFeedbackControl \
+	XGetDeviceFocus \
+	XGetDeviceDontPropagateList \
+	XGetExtensionVersion \
+	XGrabDevice \
+	XGrabDeviceButton \
+	XGrabDeviceKey \
+	XGetDeviceButtonMapping \
+	XGetDeviceKeyMapping \
+	XGetDeviceModifierMapping \
+	XGetDeviceMotionEvents \
+	XGetSelectedExtensionEvents \
+	XListInputDevices \
+	Miscellaneous \
+	XOpenDevice \
+	XQueryDeviceState \
+	XSetDeviceValuators \
+	XSetDeviceButtonMapping \
+	XSetDeviceFocus \
+	XSetDeviceModifierMapping \
+	XSetDeviceMode \
+	XSelectExtensionEvent \
+	XSendExtensionEvent \
+	XUngrabDevice \
+	XUngrabDeviceButton \
+	XUngrabDeviceKey
+
+# Store results in xts5/results/YYYY-mm-dd-HH:mm.xzy
+logfile:
+	date=`date +%F-%R`.XXXXX && \
+	XTS_RESULTS_DIR=`mktemp -d --tmpdir=$(top_srcdir)/xts5/results $$date` && \
+	cat $(LOGFILES) > $$XTS_RESULTS_DIR/xts.log
diff --git a/xts5/tset/SHAPE/XShapeCombineMask/XShapeCombineMask.m b/xts5/SHAPE/XShapeCombineMask/XShapeCombineMask.m
index 62fa1c32..62fa1c32 100644
--- a/xts5/tset/SHAPE/XShapeCombineMask/XShapeCombineMask.m
+++ b/xts5/SHAPE/XShapeCombineMask/XShapeCombineMask.m
diff --git a/xts5/tset/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m b/xts5/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m
index 4863cab1..4863cab1 100644
--- a/xts5/tset/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m
+++ b/xts5/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles.m
diff --git a/xts5/tset/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m b/xts5/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m
index 06cb3ba1..06cb3ba1 100644
--- a/xts5/tset/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m
+++ b/xts5/SHAPE/XShapeCombineRegion/XShapeCombineRegion.m
diff --git a/xts5/tset/SHAPE/XShapeCombineShape/XShapeCombineShape.m b/xts5/SHAPE/XShapeCombineShape/XShapeCombineShape.m
index e41f365d..e41f365d 100644
--- a/xts5/tset/SHAPE/XShapeCombineShape/XShapeCombineShape.m
+++ b/xts5/SHAPE/XShapeCombineShape/XShapeCombineShape.m
diff --git a/xts5/tset/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m b/xts5/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m
index af71d174..af71d174 100644
--- a/xts5/tset/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m
+++ b/xts5/SHAPE/XShapeGetRectangles/XShapeGetRectangles.m
diff --git a/xts5/tset/SHAPE/XShapeInputSelected/XShapeInputSelected.m b/xts5/SHAPE/XShapeInputSelected/XShapeInputSelected.m
index 5f6d022c..5f6d022c 100644
--- a/xts5/tset/SHAPE/XShapeInputSelected/XShapeInputSelected.m
+++ b/xts5/SHAPE/XShapeInputSelected/XShapeInputSelected.m
diff --git a/xts5/tset/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m b/xts5/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m
index 16478ad1..16478ad1 100644
--- a/xts5/tset/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m
+++ b/xts5/SHAPE/XShapeOffsetShape/XShapeOffsetShape.m
diff --git a/xts5/tset/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m b/xts5/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m
index 34b3aa91..34b3aa91 100644
--- a/xts5/tset/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m
+++ b/xts5/SHAPE/XShapeQueryExtension/XShapeQueryExtension.m
diff --git a/xts5/tset/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m b/xts5/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m
index 65da1894..65da1894 100644
--- a/xts5/tset/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m
+++ b/xts5/SHAPE/XShapeQueryExtents/XShapeQueryExtents.m
diff --git a/xts5/tset/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m b/xts5/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m
index 88b17a1e..88b17a1e 100644
--- a/xts5/tset/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m
+++ b/xts5/SHAPE/XShapeQueryVersion/XShapeQueryVersion.m
diff --git a/xts5/tset/SHAPE/XShapeSelectInput/XShapeSelectInput.m b/xts5/SHAPE/XShapeSelectInput/XShapeSelectInput.m
index 14584328..14584328 100644
--- a/xts5/tset/SHAPE/XShapeSelectInput/XShapeSelectInput.m
+++ b/xts5/SHAPE/XShapeSelectInput/XShapeSelectInput.m
diff --git a/xts5/tset/XI/.gitignore b/xts5/XI/.gitignore
index f7b3f6a0..f7b3f6a0 100644
--- a/xts5/tset/XI/.gitignore
+++ b/xts5/XI/.gitignore
diff --git a/xts5/tset/XI/AllowDeviceEvents/AllowDeviceEvents.m b/xts5/XI/AllowDeviceEvents/AllowDeviceEvents.m
index ecdb2440..ecdb2440 100644
--- a/xts5/tset/XI/AllowDeviceEvents/AllowDeviceEvents.m
+++ b/xts5/XI/AllowDeviceEvents/AllowDeviceEvents.m
diff --git a/xts5/tset/XI/ChangeDeviceControl/ChangeDeviceControl.m b/xts5/XI/ChangeDeviceControl/ChangeDeviceControl.m
index db886eb6..db886eb6 100644
--- a/xts5/tset/XI/ChangeDeviceControl/ChangeDeviceControl.m
+++ b/xts5/XI/ChangeDeviceControl/ChangeDeviceControl.m
diff --git a/xts5/tset/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m b/xts5/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m
index 6e3977e1..6e3977e1 100644
--- a/xts5/tset/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m
+++ b/xts5/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m
diff --git a/xts5/tset/XI/ChangeFeedbackControl/ChangeFeedbackControl.m b/xts5/XI/ChangeFeedbackControl/ChangeFeedbackControl.m
index 4c6f2c14..4c6f2c14 100644
--- a/xts5/tset/XI/ChangeFeedbackControl/ChangeFeedbackControl.m
+++ b/xts5/XI/ChangeFeedbackControl/ChangeFeedbackControl.m
diff --git a/xts5/tset/XI/ChangeKeyboardDevice/ChangeKeyboardDevice.m b/xts5/XI/ChangeKeyboardDevice/ChangeKeyboardDevice.m
index 956af541..956af541 100644
--- a/xts5/tset/XI/ChangeKeyboardDevice/ChangeKeyboardDevice.m
+++ b/xts5/XI/ChangeKeyboardDevice/ChangeKeyboardDevice.m
diff --git a/xts5/tset/XI/ChangePointerDevice/ChangePointerDevice.m b/xts5/XI/ChangePointerDevice/ChangePointerDevice.m
index b2104b7e..b2104b7e 100644
--- a/xts5/tset/XI/ChangePointerDevice/ChangePointerDevice.m
+++ b/xts5/XI/ChangePointerDevice/ChangePointerDevice.m
diff --git a/xts5/tset/XI/CloseDevice/CloseDevice.m b/xts5/XI/CloseDevice/CloseDevice.m
index 94e2771c..94e2771c 100644
--- a/xts5/tset/XI/CloseDevice/CloseDevice.m
+++ b/xts5/XI/CloseDevice/CloseDevice.m
diff --git a/xts5/tset/XI/DeviceBell/DeviceBell.m b/xts5/XI/DeviceBell/DeviceBell.m
index 33fa36b5..33fa36b5 100644
--- a/xts5/tset/XI/DeviceBell/DeviceBell.m
+++ b/xts5/XI/DeviceBell/DeviceBell.m
diff --git a/xts5/tset/XI/GetDeviceButtonMapping/GetDeviceButtonMapping.m b/xts5/XI/GetDeviceButtonMapping/GetDeviceButtonMapping.m
index 831bfad1..831bfad1 100644
--- a/xts5/tset/XI/GetDeviceButtonMapping/GetDeviceButtonMapping.m
+++ b/xts5/XI/GetDeviceButtonMapping/GetDeviceButtonMapping.m
diff --git a/xts5/tset/XI/GetDeviceMotionEvents/GetDeviceMotionEvents.m b/xts5/XI/GetDeviceMotionEvents/GetDeviceMotionEvents.m
index 714dbda6..714dbda6 100644
--- a/xts5/tset/XI/GetDeviceMotionEvents/GetDeviceMotionEvents.m
+++ b/xts5/XI/GetDeviceMotionEvents/GetDeviceMotionEvents.m
diff --git a/xts5/tset/XI/GetExtensionVersion/GetExtensionVersion.m b/xts5/XI/GetExtensionVersion/GetExtensionVersion.m
index d59c0ed7..d59c0ed7 100644
--- a/xts5/tset/XI/GetExtensionVersion/GetExtensionVersion.m
+++ b/xts5/XI/GetExtensionVersion/GetExtensionVersion.m
diff --git a/xts5/tset/XI/GetFeedbackControl/GetFeedbackControl.m b/xts5/XI/GetFeedbackControl/GetFeedbackControl.m
index c7e261da..c7e261da 100644
--- a/xts5/tset/XI/GetFeedbackControl/GetFeedbackControl.m
+++ b/xts5/XI/GetFeedbackControl/GetFeedbackControl.m
diff --git a/xts5/tset/XI/GrabDevice/GrabDevice.m b/xts5/XI/GrabDevice/GrabDevice.m
index 28178544..28178544 100644
--- a/xts5/tset/XI/GrabDevice/GrabDevice.m
+++ b/xts5/XI/GrabDevice/GrabDevice.m
diff --git a/xts5/tset/XI/GrabDeviceButton/GrabDeviceButton.m b/xts5/XI/GrabDeviceButton/GrabDeviceButton.m
index 369f2fcd..369f2fcd 100644
--- a/xts5/tset/XI/GrabDeviceButton/GrabDeviceButton.m
+++ b/xts5/XI/GrabDeviceButton/GrabDeviceButton.m
diff --git a/xts5/tset/XI/GrabDeviceKey/GrabDeviceKey.m b/xts5/XI/GrabDeviceKey/GrabDeviceKey.m
index 95329af9..95329af9 100644
--- a/xts5/tset/XI/GrabDeviceKey/GrabDeviceKey.m
+++ b/xts5/XI/GrabDeviceKey/GrabDeviceKey.m
diff --git a/xts5/tset/XI/ListInputDevices/ListInputDevices.m b/xts5/XI/ListInputDevices/ListInputDevices.m
index 4c9edbc3..4c9edbc3 100644
--- a/xts5/tset/XI/ListInputDevices/ListInputDevices.m
+++ b/xts5/XI/ListInputDevices/ListInputDevices.m
diff --git a/xts5/tset/XI/Makefile.am b/xts5/XI/Makefile.am
index ff984fb5..ff984fb5 100644
--- a/xts5/tset/XI/Makefile.am
+++ b/xts5/XI/Makefile.am
diff --git a/xts5/tset/XI/Miscellaneous/Miscellaneous.m b/xts5/XI/Miscellaneous/Miscellaneous.m
index 05a9cf08..05a9cf08 100644
--- a/xts5/tset/XI/Miscellaneous/Miscellaneous.m
+++ b/xts5/XI/Miscellaneous/Miscellaneous.m
diff --git a/xts5/tset/XI/OpenDevice/OpenDevice.m b/xts5/XI/OpenDevice/OpenDevice.m
index 86ece821..86ece821 100644
--- a/xts5/tset/XI/OpenDevice/OpenDevice.m
+++ b/xts5/XI/OpenDevice/OpenDevice.m
diff --git a/xts5/tset/XI/SendExtensionEvent/SendExtensionEvent.m b/xts5/XI/SendExtensionEvent/SendExtensionEvent.m
index 60895a38..60895a38 100644
--- a/xts5/tset/XI/SendExtensionEvent/SendExtensionEvent.m
+++ b/xts5/XI/SendExtensionEvent/SendExtensionEvent.m
diff --git a/xts5/tset/XI/SetDeviceButtonMapping/SetDeviceButtonMapping.m b/xts5/XI/SetDeviceButtonMapping/SetDeviceButtonMapping.m
index e7c5bdb5..e7c5bdb5 100644
--- a/xts5/tset/XI/SetDeviceButtonMapping/SetDeviceButtonMapping.m
+++ b/xts5/XI/SetDeviceButtonMapping/SetDeviceButtonMapping.m
diff --git a/xts5/tset/XI/SetDeviceMode/SetDeviceMode.m b/xts5/XI/SetDeviceMode/SetDeviceMode.m
index c52346a9..c52346a9 100644
--- a/xts5/tset/XI/SetDeviceMode/SetDeviceMode.m
+++ b/xts5/XI/SetDeviceMode/SetDeviceMode.m
diff --git a/xts5/tset/XI/SetDeviceModifierMapping/SetDeviceModifierMapping.m b/xts5/XI/SetDeviceModifierMapping/SetDeviceModifierMapping.m
index cfd5b70e..cfd5b70e 100644
--- a/xts5/tset/XI/SetDeviceModifierMapping/SetDeviceModifierMapping.m
+++ b/xts5/XI/SetDeviceModifierMapping/SetDeviceModifierMapping.m
diff --git a/xts5/tset/XI/SetDeviceValuators/SetDeviceValuators.m b/xts5/XI/SetDeviceValuators/SetDeviceValuators.m
index d1f27160..d1f27160 100644
--- a/xts5/tset/XI/SetDeviceValuators/SetDeviceValuators.m
+++ b/xts5/XI/SetDeviceValuators/SetDeviceValuators.m
diff --git a/xts5/tset/XI/UngrabDeviceButton/UngrabDeviceButton.m b/xts5/XI/UngrabDeviceButton/UngrabDeviceButton.m
index 128a50e6..128a50e6 100644
--- a/xts5/tset/XI/UngrabDeviceButton/UngrabDeviceButton.m
+++ b/xts5/XI/UngrabDeviceButton/UngrabDeviceButton.m
diff --git a/xts5/tset/XI/UngrabDeviceKey/UngrabDeviceKey.m b/xts5/XI/UngrabDeviceKey/UngrabDeviceKey.m
index 408bda72..408bda72 100644
--- a/xts5/tset/XI/UngrabDeviceKey/UngrabDeviceKey.m
+++ b/xts5/XI/UngrabDeviceKey/UngrabDeviceKey.m
diff --git a/xts5/tset/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList.m b/xts5/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList.m
index 372082f9..372082f9 100644
--- a/xts5/tset/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList.m
+++ b/xts5/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList.m
diff --git a/xts5/tset/XI/XGetDeviceControl/XGetDeviceControl.m b/xts5/XI/XGetDeviceControl/XGetDeviceControl.m
index 57798e84..57798e84 100644
--- a/xts5/tset/XI/XGetDeviceControl/XGetDeviceControl.m
+++ b/xts5/XI/XGetDeviceControl/XGetDeviceControl.m
diff --git a/xts5/tset/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList.m b/xts5/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList.m
index b1561795..b1561795 100644
--- a/xts5/tset/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList.m
+++ b/xts5/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList.m
diff --git a/xts5/tset/XI/XGetDeviceFocus/XGetDeviceFocus.m b/xts5/XI/XGetDeviceFocus/XGetDeviceFocus.m
index 91555bf6..91555bf6 100644
--- a/xts5/tset/XI/XGetDeviceFocus/XGetDeviceFocus.m
+++ b/xts5/XI/XGetDeviceFocus/XGetDeviceFocus.m
diff --git a/xts5/tset/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping.m b/xts5/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping.m
index 8d93f227..8d93f227 100644
--- a/xts5/tset/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping.m
+++ b/xts5/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping.m
diff --git a/xts5/tset/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping.m b/xts5/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping.m
index 85065c4d..85065c4d 100644
--- a/xts5/tset/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping.m
+++ b/xts5/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping.m
diff --git a/xts5/tset/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents.m b/xts5/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents.m
index 9ecb0ac2..9ecb0ac2 100644
--- a/xts5/tset/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents.m
+++ b/xts5/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents.m
diff --git a/xts5/tset/XI/XQueryDeviceState/XQueryDeviceState.m b/xts5/XI/XQueryDeviceState/XQueryDeviceState.m
index 54bc15c7..54bc15c7 100644
--- a/xts5/tset/XI/XQueryDeviceState/XQueryDeviceState.m
+++ b/xts5/XI/XQueryDeviceState/XQueryDeviceState.m
diff --git a/xts5/tset/XI/XSelectExtensionEvent/XSelectExtensionEvent.m b/xts5/XI/XSelectExtensionEvent/XSelectExtensionEvent.m
index a64db0d6..a64db0d6 100644
--- a/xts5/tset/XI/XSelectExtensionEvent/XSelectExtensionEvent.m
+++ b/xts5/XI/XSelectExtensionEvent/XSelectExtensionEvent.m
diff --git a/xts5/tset/XI/XSetDeviceFocus/XSetDeviceFocus.m b/xts5/XI/XSetDeviceFocus/XSetDeviceFocus.m
index d040e961..d040e961 100644
--- a/xts5/tset/XI/XSetDeviceFocus/XSetDeviceFocus.m
+++ b/xts5/XI/XSetDeviceFocus/XSetDeviceFocus.m
diff --git a/xts5/tset/XI/XUngrabDevice/XUngrabDevice.m b/xts5/XI/XUngrabDevice/XUngrabDevice.m
index 99440399..99440399 100644
--- a/xts5/tset/XI/XUngrabDevice/XUngrabDevice.m
+++ b/xts5/XI/XUngrabDevice/XUngrabDevice.m
diff --git a/xts5/tset/XIproto/.gitignore b/xts5/XIproto/.gitignore
index a75a127b..a75a127b 100644
--- a/xts5/tset/XIproto/.gitignore
+++ b/xts5/XIproto/.gitignore
diff --git a/xts5/tset/XIproto/AllowDeviceEvents/AllowDeviceEvents.m b/xts5/XIproto/AllowDeviceEvents/AllowDeviceEvents.m
index f309ffa3..f309ffa3 100644
--- a/xts5/tset/XIproto/AllowDeviceEvents/AllowDeviceEvents.m
+++ b/xts5/XIproto/AllowDeviceEvents/AllowDeviceEvents.m
diff --git a/xts5/tset/XIproto/ChangeDeviceControl/ChangeDeviceControl.m b/xts5/XIproto/ChangeDeviceControl/ChangeDeviceControl.m
index ede4f828..ede4f828 100644
--- a/xts5/tset/XIproto/ChangeDeviceControl/ChangeDeviceControl.m
+++ b/xts5/XIproto/ChangeDeviceControl/ChangeDeviceControl.m
diff --git a/xts5/tset/XIproto/ChangeDeviceDontPropagateList/ChangeDeviceDontPropagateList.m b/xts5/XIproto/ChangeDeviceDontPropagateList/ChangeDeviceDontPropagateList.m
index 658cac1d..658cac1d 100644
--- a/xts5/tset/XIproto/ChangeDeviceDontPropagateList/ChangeDeviceDontPropagateList.m
+++ b/xts5/XIproto/ChangeDeviceDontPropagateList/ChangeDeviceDontPropagateList.m
diff --git a/xts5/tset/XIproto/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m b/xts5/XIproto/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m
index 6a2abf28..6a2abf28 100644
--- a/xts5/tset/XIproto/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m
+++ b/xts5/XIproto/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping.m
diff --git a/xts5/tset/XIproto/ChangeFeedbackControl/ChangeFeedbackControl.m b/xts5/XIproto/ChangeFeedbackControl/ChangeFeedbackControl.m
index 4b30db5c..4b30db5c 100644
--- a/xts5/tset/XIproto/ChangeFeedbackControl/ChangeFeedbackControl.m
+++ b/xts5/XIproto/ChangeFeedbackControl/ChangeFeedbackControl.m
diff --git a/xts5/tset/XIproto/ChangeKeyboardDevice/ChangeKeyboardDevice.m b/xts5/XIproto/ChangeKeyboardDevice/ChangeKeyboardDevice.m
index ced631e6..ced631e6 100644
--- a/xts5/tset/XIproto/ChangeKeyboardDevice/ChangeKeyboardDevice.m
+++ b/xts5/XIproto/ChangeKeyboardDevice/ChangeKeyboardDevice.m
diff --git a/xts5/tset/XIproto/ChangePointerDevice/ChangePointerDevice.m b/xts5/XIproto/ChangePointerDevice/ChangePointerDevice.m
index 5e35957e..5e35957e 100644
--- a/xts5/tset/XIproto/ChangePointerDevice/ChangePointerDevice.m
+++ b/xts5/XIproto/ChangePointerDevice/ChangePointerDevice.m
diff --git a/xts5/tset/XIproto/CloseDevice/CloseDevice.m b/xts5/XIproto/CloseDevice/CloseDevice.m
index ea367eb9..ea367eb9 100644
--- a/xts5/tset/XIproto/CloseDevice/CloseDevice.m
+++ b/xts5/XIproto/CloseDevice/CloseDevice.m
diff --git a/xts5/tset/XIproto/DeviceBell/DeviceBell.m b/xts5/XIproto/DeviceBell/DeviceBell.m
index 8f78736d..8f78736d 100644
--- a/xts5/tset/XIproto/DeviceBell/DeviceBell.m
+++ b/xts5/XIproto/DeviceBell/DeviceBell.m
diff --git a/xts5/tset/XIproto/GetDeviceButtonMapping/GetDeviceButtonMapping.m b/xts5/XIproto/GetDeviceButtonMapping/GetDeviceButtonMapping.m
index ca51afd9..ca51afd9 100644
--- a/xts5/tset/XIproto/GetDeviceButtonMapping/GetDeviceButtonMapping.m
+++ b/xts5/XIproto/GetDeviceButtonMapping/GetDeviceButtonMapping.m
diff --git a/xts5/tset/XIproto/GetDeviceControl/GetDeviceControl.m b/xts5/XIproto/GetDeviceControl/GetDeviceControl.m
index 07619eab..07619eab 100644
--- a/xts5/tset/XIproto/GetDeviceControl/GetDeviceControl.m
+++ b/xts5/XIproto/GetDeviceControl/GetDeviceControl.m
diff --git a/xts5/tset/XIproto/GetDeviceDontPropagateList/GetDeviceDontPropagateList.m b/xts5/XIproto/GetDeviceDontPropagateList/GetDeviceDontPropagateList.m
index 58eca796..58eca796 100644
--- a/xts5/tset/XIproto/GetDeviceDontPropagateList/GetDeviceDontPropagateList.m
+++ b/xts5/XIproto/GetDeviceDontPropagateList/GetDeviceDontPropagateList.m
diff --git a/xts5/tset/XIproto/GetDeviceFocus/GetDeviceFocus.m b/xts5/XIproto/GetDeviceFocus/GetDeviceFocus.m
index a7a2eda1..a7a2eda1 100644
--- a/xts5/tset/XIproto/GetDeviceFocus/GetDeviceFocus.m
+++ b/xts5/XIproto/GetDeviceFocus/GetDeviceFocus.m
diff --git a/xts5/tset/XIproto/GetDeviceKeyMapping/GetDeviceKeyMapping.m b/xts5/XIproto/GetDeviceKeyMapping/GetDeviceKeyMapping.m
index 7cf1c12e..7cf1c12e 100644
--- a/xts5/tset/XIproto/GetDeviceKeyMapping/GetDeviceKeyMapping.m
+++ b/xts5/XIproto/GetDeviceKeyMapping/GetDeviceKeyMapping.m
diff --git a/xts5/tset/XIproto/GetDeviceModifierMapping/GetDeviceModifierMapping.m b/xts5/XIproto/GetDeviceModifierMapping/GetDeviceModifierMapping.m
index 024b3e62..024b3e62 100644
--- a/xts5/tset/XIproto/GetDeviceModifierMapping/GetDeviceModifierMapping.m
+++ b/xts5/XIproto/GetDeviceModifierMapping/GetDeviceModifierMapping.m
diff --git a/xts5/tset/XIproto/GetDeviceMotionEvents/GetDeviceMotionEvents.m b/xts5/XIproto/GetDeviceMotionEvents/GetDeviceMotionEvents.m
index 43362f03..43362f03 100644
--- a/xts5/tset/XIproto/GetDeviceMotionEvents/GetDeviceMotionEvents.m
+++ b/xts5/XIproto/GetDeviceMotionEvents/GetDeviceMotionEvents.m
diff --git a/xts5/tset/XIproto/GetExtensionVersion/GetExtensionVersion.m b/xts5/XIproto/GetExtensionVersion/GetExtensionVersion.m
index ffc180fc..ffc180fc 100644
--- a/xts5/tset/XIproto/GetExtensionVersion/GetExtensionVersion.m
+++ b/xts5/XIproto/GetExtensionVersion/GetExtensionVersion.m
diff --git a/xts5/tset/XIproto/GetFeedbackControl/GetFeedbackControl.m b/xts5/XIproto/GetFeedbackControl/GetFeedbackControl.m
index 35ae9ef9..35ae9ef9 100644
--- a/xts5/tset/XIproto/GetFeedbackControl/GetFeedbackControl.m
+++ b/xts5/XIproto/GetFeedbackControl/GetFeedbackControl.m
diff --git a/xts5/tset/XIproto/GetSelectedExtensionEvents/GetSelectedExtensionEvents.m b/xts5/XIproto/GetSelectedExtensionEvents/GetSelectedExtensionEvents.m
index 1e90dd6a..1e90dd6a 100644
--- a/xts5/tset/XIproto/GetSelectedExtensionEvents/GetSelectedExtensionEvents.m
+++ b/xts5/XIproto/GetSelectedExtensionEvents/GetSelectedExtensionEvents.m
diff --git a/xts5/tset/XIproto/GrabDevice/GrabDevice.m b/xts5/XIproto/GrabDevice/GrabDevice.m
index 13909799..13909799 100644
--- a/xts5/tset/XIproto/GrabDevice/GrabDevice.m
+++ b/xts5/XIproto/GrabDevice/GrabDevice.m
diff --git a/xts5/tset/XIproto/GrabDeviceButton/GrabDeviceButton.m b/xts5/XIproto/GrabDeviceButton/GrabDeviceButton.m
index 902ea0d3..902ea0d3 100644
--- a/xts5/tset/XIproto/GrabDeviceButton/GrabDeviceButton.m
+++ b/xts5/XIproto/GrabDeviceButton/GrabDeviceButton.m
diff --git a/xts5/tset/XIproto/GrabDeviceKey/GrabDeviceKey.m b/xts5/XIproto/GrabDeviceKey/GrabDeviceKey.m
index 27ea9d34..27ea9d34 100644
--- a/xts5/tset/XIproto/GrabDeviceKey/GrabDeviceKey.m
+++ b/xts5/XIproto/GrabDeviceKey/GrabDeviceKey.m
diff --git a/xts5/tset/XIproto/ListInputDevices/ListInputDevices.m b/xts5/XIproto/ListInputDevices/ListInputDevices.m
index 196e2172..196e2172 100644
--- a/xts5/tset/XIproto/ListInputDevices/ListInputDevices.m
+++ b/xts5/XIproto/ListInputDevices/ListInputDevices.m
diff --git a/xts5/tset/XIproto/Makefile.am b/xts5/XIproto/Makefile.am
index 2c91bf29..2c91bf29 100644
--- a/xts5/tset/XIproto/Makefile.am
+++ b/xts5/XIproto/Makefile.am
diff --git a/xts5/tset/XIproto/Miscellaneous/Miscellaneous.m b/xts5/XIproto/Miscellaneous/Miscellaneous.m
index 7eb1928f..7eb1928f 100644
--- a/xts5/tset/XIproto/Miscellaneous/Miscellaneous.m
+++ b/xts5/XIproto/Miscellaneous/Miscellaneous.m
diff --git a/xts5/tset/XIproto/OpenDevice/OpenDevice.m b/xts5/XIproto/OpenDevice/OpenDevice.m
index e79ad991..e79ad991 100644
--- a/xts5/tset/XIproto/OpenDevice/OpenDevice.m
+++ b/xts5/XIproto/OpenDevice/OpenDevice.m
diff --git a/xts5/tset/XIproto/QueryDeviceState/QueryDeviceState.m b/xts5/XIproto/QueryDeviceState/QueryDeviceState.m
index 5f760ab2..5f760ab2 100644
--- a/xts5/tset/XIproto/QueryDeviceState/QueryDeviceState.m
+++ b/xts5/XIproto/QueryDeviceState/QueryDeviceState.m
diff --git a/xts5/tset/XIproto/SelectExtensionEvent/SelectExtensionEvent.m b/xts5/XIproto/SelectExtensionEvent/SelectExtensionEvent.m
index b341c57e..b341c57e 100644
--- a/xts5/tset/XIproto/SelectExtensionEvent/SelectExtensionEvent.m
+++ b/xts5/XIproto/SelectExtensionEvent/SelectExtensionEvent.m
diff --git a/xts5/tset/XIproto/SendExtensionEvent/SendExtensionEvent.m b/xts5/XIproto/SendExtensionEvent/SendExtensionEvent.m
index 613207ab..613207ab 100644
--- a/xts5/tset/XIproto/SendExtensionEvent/SendExtensionEvent.m
+++ b/xts5/XIproto/SendExtensionEvent/SendExtensionEvent.m
diff --git a/xts5/tset/XIproto/SetDeviceButtonMapping/SetDeviceButtonMapping.m b/xts5/XIproto/SetDeviceButtonMapping/SetDeviceButtonMapping.m
index c21df3c9..c21df3c9 100644
--- a/xts5/tset/XIproto/SetDeviceButtonMapping/SetDeviceButtonMapping.m
+++ b/xts5/XIproto/SetDeviceButtonMapping/SetDeviceButtonMapping.m
diff --git a/xts5/tset/XIproto/SetDeviceFocus/SetDeviceFocus.m b/xts5/XIproto/SetDeviceFocus/SetDeviceFocus.m
index 8870bd01..8870bd01 100644
--- a/xts5/tset/XIproto/SetDeviceFocus/SetDeviceFocus.m
+++ b/xts5/XIproto/SetDeviceFocus/SetDeviceFocus.m
diff --git a/xts5/tset/XIproto/SetDeviceMode/SetDeviceMode.m b/xts5/XIproto/SetDeviceMode/SetDeviceMode.m
index 7af58b27..7af58b27 100644
--- a/xts5/tset/XIproto/SetDeviceMode/SetDeviceMode.m
+++ b/xts5/XIproto/SetDeviceMode/SetDeviceMode.m
diff --git a/xts5/tset/XIproto/SetDeviceModifierMapping/SetDeviceModifierMapping.m b/xts5/XIproto/SetDeviceModifierMapping/SetDeviceModifierMapping.m
index 29a8f499..29a8f499 100644
--- a/xts5/tset/XIproto/SetDeviceModifierMapping/SetDeviceModifierMapping.m
+++ b/xts5/XIproto/SetDeviceModifierMapping/SetDeviceModifierMapping.m
diff --git a/xts5/tset/XIproto/SetDeviceValuators/SetDeviceValuators.m b/xts5/XIproto/SetDeviceValuators/SetDeviceValuators.m
index 3457340d..3457340d 100644
--- a/xts5/tset/XIproto/SetDeviceValuators/SetDeviceValuators.m
+++ b/xts5/XIproto/SetDeviceValuators/SetDeviceValuators.m
diff --git a/xts5/tset/XIproto/UngrabDevice/UngrabDevice.m b/xts5/XIproto/UngrabDevice/UngrabDevice.m
index 94988cb6..94988cb6 100644
--- a/xts5/tset/XIproto/UngrabDevice/UngrabDevice.m
+++ b/xts5/XIproto/UngrabDevice/UngrabDevice.m
diff --git a/xts5/tset/XIproto/UngrabDeviceButton/UngrabDeviceButton.m b/xts5/XIproto/UngrabDeviceButton/UngrabDeviceButton.m
index a08b19c8..a08b19c8 100644
--- a/xts5/tset/XIproto/UngrabDeviceButton/UngrabDeviceButton.m
+++ b/xts5/XIproto/UngrabDeviceButton/UngrabDeviceButton.m
diff --git a/xts5/tset/XIproto/UngrabDeviceKey/UngrabDeviceKey.m b/xts5/XIproto/UngrabDeviceKey/UngrabDeviceKey.m
index f4b9e906..f4b9e906 100644
--- a/xts5/tset/XIproto/UngrabDeviceKey/UngrabDeviceKey.m
+++ b/xts5/XIproto/UngrabDeviceKey/UngrabDeviceKey.m
diff --git a/xts5/tset/Xlib10/.gitignore b/xts5/Xlib10/.gitignore
index d094b03e..d094b03e 100644
--- a/xts5/tset/Xlib10/.gitignore
+++ b/xts5/Xlib10/.gitignore
diff --git a/xts5/tset/Xlib10/Makefile.am b/xts5/Xlib10/Makefile.am
index ec98940c..ec98940c 100644
--- a/xts5/tset/Xlib10/Makefile.am
+++ b/xts5/Xlib10/Makefile.am
diff --git a/xts5/tset/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m b/xts5/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m
index 3318eadb..3318eadb 100644
--- a/xts5/tset/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m
+++ b/xts5/Xlib10/XActivateScreenSaver/XActivateScreenSaver.m
diff --git a/xts5/tset/Xlib10/XAddHost/XAddHost.m b/xts5/Xlib10/XAddHost/XAddHost.m
index e7789d77..e7789d77 100644
--- a/xts5/tset/Xlib10/XAddHost/XAddHost.m
+++ b/xts5/Xlib10/XAddHost/XAddHost.m
diff --git a/xts5/tset/Xlib10/XAddHosts/XAddHosts.m b/xts5/Xlib10/XAddHosts/XAddHosts.m
index e997ae5a..e997ae5a 100644
--- a/xts5/tset/Xlib10/XAddHosts/XAddHosts.m
+++ b/xts5/Xlib10/XAddHosts/XAddHosts.m
diff --git a/xts5/tset/Xlib10/XAddToSaveSet/XAddToSaveSet.m b/xts5/Xlib10/XAddToSaveSet/XAddToSaveSet.m
index 3c47a9f5..3c47a9f5 100644
--- a/xts5/tset/Xlib10/XAddToSaveSet/XAddToSaveSet.m
+++ b/xts5/Xlib10/XAddToSaveSet/XAddToSaveSet.m
diff --git a/xts5/tset/Xlib10/XChangeSaveSet/XChangeSaveSet.m b/xts5/Xlib10/XChangeSaveSet/XChangeSaveSet.m
index 7eec8794..7eec8794 100644
--- a/xts5/tset/Xlib10/XChangeSaveSet/XChangeSaveSet.m
+++ b/xts5/Xlib10/XChangeSaveSet/XChangeSaveSet.m
diff --git a/xts5/tset/Xlib10/XDisableAccessControl/XDisableAccessControl.m b/xts5/Xlib10/XDisableAccessControl/XDisableAccessControl.m
index afd9bf24..afd9bf24 100644
--- a/xts5/tset/Xlib10/XDisableAccessControl/XDisableAccessControl.m
+++ b/xts5/Xlib10/XDisableAccessControl/XDisableAccessControl.m
diff --git a/xts5/tset/Xlib10/XEnableAccessControl/XEnableAccessControl.m b/xts5/Xlib10/XEnableAccessControl/XEnableAccessControl.m
index 1118e2a0..1118e2a0 100644
--- a/xts5/tset/Xlib10/XEnableAccessControl/XEnableAccessControl.m
+++ b/xts5/Xlib10/XEnableAccessControl/XEnableAccessControl.m
diff --git a/xts5/tset/Xlib10/XForceScreenSaver/XForceScreenSaver.m b/xts5/Xlib10/XForceScreenSaver/XForceScreenSaver.m
index 3e98843d..3e98843d 100644
--- a/xts5/tset/Xlib10/XForceScreenSaver/XForceScreenSaver.m
+++ b/xts5/Xlib10/XForceScreenSaver/XForceScreenSaver.m
diff --git a/xts5/tset/Xlib10/XGetScreenSaver/XGetScreenSaver.m b/xts5/Xlib10/XGetScreenSaver/XGetScreenSaver.m
index c4b696c5..c4b696c5 100644
--- a/xts5/tset/Xlib10/XGetScreenSaver/XGetScreenSaver.m
+++ b/xts5/Xlib10/XGetScreenSaver/XGetScreenSaver.m
diff --git a/xts5/tset/Xlib10/XGrabServer/XGrabServer.m b/xts5/Xlib10/XGrabServer/XGrabServer.m
index dbc049c9..dbc049c9 100644
--- a/xts5/tset/Xlib10/XGrabServer/XGrabServer.m
+++ b/xts5/Xlib10/XGrabServer/XGrabServer.m
diff --git a/xts5/tset/Xlib10/XInstallColormap/XInstallColormap.m b/xts5/Xlib10/XInstallColormap/XInstallColormap.m
index 4c38e8f0..4c38e8f0 100644
--- a/xts5/tset/Xlib10/XInstallColormap/XInstallColormap.m
+++ b/xts5/Xlib10/XInstallColormap/XInstallColormap.m
diff --git a/xts5/tset/Xlib10/XKillClient/XKillClient.m b/xts5/Xlib10/XKillClient/XKillClient.m
index 1ca057ec..1ca057ec 100644
--- a/xts5/tset/Xlib10/XKillClient/XKillClient.m
+++ b/xts5/Xlib10/XKillClient/XKillClient.m
diff --git a/xts5/tset/Xlib10/XListHosts/XListHosts.m b/xts5/Xlib10/XListHosts/XListHosts.m
index ca7f0ed3..ca7f0ed3 100644
--- a/xts5/tset/Xlib10/XListHosts/XListHosts.m
+++ b/xts5/Xlib10/XListHosts/XListHosts.m
diff --git a/xts5/tset/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m b/xts5/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m
index 621ade12..621ade12 100644
--- a/xts5/tset/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m
+++ b/xts5/Xlib10/XListInstalledColormaps/XListInstalledColormaps.m
diff --git a/xts5/tset/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m b/xts5/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m
index 82163135..82163135 100644
--- a/xts5/tset/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m
+++ b/xts5/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet.m
diff --git a/xts5/tset/Xlib10/XRemoveHost/XRemoveHost.m b/xts5/Xlib10/XRemoveHost/XRemoveHost.m
index bfdbbf2e..bfdbbf2e 100644
--- a/xts5/tset/Xlib10/XRemoveHost/XRemoveHost.m
+++ b/xts5/Xlib10/XRemoveHost/XRemoveHost.m
diff --git a/xts5/tset/Xlib10/XRemoveHosts/XRemoveHosts.m b/xts5/Xlib10/XRemoveHosts/XRemoveHosts.m
index 593d1aef..593d1aef 100644
--- a/xts5/tset/Xlib10/XRemoveHosts/XRemoveHosts.m
+++ b/xts5/Xlib10/XRemoveHosts/XRemoveHosts.m
diff --git a/xts5/tset/Xlib10/XReparentWindow/XReparentWindow.m b/xts5/Xlib10/XReparentWindow/XReparentWindow.m
index 1f592a5a..1f592a5a 100644
--- a/xts5/tset/Xlib10/XReparentWindow/XReparentWindow.m
+++ b/xts5/Xlib10/XReparentWindow/XReparentWindow.m
diff --git a/xts5/tset/Xlib10/XResetScreenSaver/XResetScreenSaver.m b/xts5/Xlib10/XResetScreenSaver/XResetScreenSaver.m
index 26a01ba8..26a01ba8 100644
--- a/xts5/tset/Xlib10/XResetScreenSaver/XResetScreenSaver.m
+++ b/xts5/Xlib10/XResetScreenSaver/XResetScreenSaver.m
diff --git a/xts5/tset/Xlib10/XSetAccessControl/XSetAccessControl.m b/xts5/Xlib10/XSetAccessControl/XSetAccessControl.m
index 904cd807..904cd807 100644
--- a/xts5/tset/Xlib10/XSetAccessControl/XSetAccessControl.m
+++ b/xts5/Xlib10/XSetAccessControl/XSetAccessControl.m
diff --git a/xts5/tset/Xlib10/XSetScreenSaver/XSetScreenSaver.m b/xts5/Xlib10/XSetScreenSaver/XSetScreenSaver.m
index d0e770da..d0e770da 100644
--- a/xts5/tset/Xlib10/XSetScreenSaver/XSetScreenSaver.m
+++ b/xts5/Xlib10/XSetScreenSaver/XSetScreenSaver.m
diff --git a/xts5/tset/Xlib10/XUngrabServer/XUngrabServer.m b/xts5/Xlib10/XUngrabServer/XUngrabServer.m
index cc64c2b3..cc64c2b3 100644
--- a/xts5/tset/Xlib10/XUngrabServer/XUngrabServer.m
+++ b/xts5/Xlib10/XUngrabServer/XUngrabServer.m
diff --git a/xts5/tset/Xlib10/XUninstallColormap/XUninstallColormap.m b/xts5/Xlib10/XUninstallColormap/XUninstallColormap.m
index 2e3a15a0..2e3a15a0 100644
--- a/xts5/tset/Xlib10/XUninstallColormap/XUninstallColormap.m
+++ b/xts5/Xlib10/XUninstallColormap/XUninstallColormap.m
diff --git a/xts5/tset/Xlib11/.gitignore b/xts5/Xlib11/.gitignore
index c7dcfe29..c7dcfe29 100644
--- a/xts5/tset/Xlib11/.gitignore
+++ b/xts5/Xlib11/.gitignore
diff --git a/xts5/tset/Xlib11/ButtonPress/ButtonPress.m b/xts5/Xlib11/ButtonPress/ButtonPress.m
index 27471bb3..27471bb3 100644
--- a/xts5/tset/Xlib11/ButtonPress/ButtonPress.m
+++ b/xts5/Xlib11/ButtonPress/ButtonPress.m
diff --git a/xts5/tset/Xlib11/ButtonRelease/ButtonRelease.m b/xts5/Xlib11/ButtonRelease/ButtonRelease.m
index a139b8ea..a139b8ea 100644
--- a/xts5/tset/Xlib11/ButtonRelease/ButtonRelease.m
+++ b/xts5/Xlib11/ButtonRelease/ButtonRelease.m
diff --git a/xts5/tset/Xlib11/CirculateNotify/CirculateNotify.m b/xts5/Xlib11/CirculateNotify/CirculateNotify.m
index 37389056..37389056 100644
--- a/xts5/tset/Xlib11/CirculateNotify/CirculateNotify.m
+++ b/xts5/Xlib11/CirculateNotify/CirculateNotify.m
diff --git a/xts5/tset/Xlib11/CirculateRequest/CirculateRequest.m b/xts5/Xlib11/CirculateRequest/CirculateRequest.m
index d780f842..d780f842 100644
--- a/xts5/tset/Xlib11/CirculateRequest/CirculateRequest.m
+++ b/xts5/Xlib11/CirculateRequest/CirculateRequest.m
diff --git a/xts5/tset/Xlib11/ClientMessage/ClientMessage.m b/xts5/Xlib11/ClientMessage/ClientMessage.m
index 515f65e3..515f65e3 100644
--- a/xts5/tset/Xlib11/ClientMessage/ClientMessage.m
+++ b/xts5/Xlib11/ClientMessage/ClientMessage.m
diff --git a/xts5/tset/Xlib11/ColormapNotify/ColormapNotify.m b/xts5/Xlib11/ColormapNotify/ColormapNotify.m
index f549bc45..f549bc45 100644
--- a/xts5/tset/Xlib11/ColormapNotify/ColormapNotify.m
+++ b/xts5/Xlib11/ColormapNotify/ColormapNotify.m
diff --git a/xts5/tset/Xlib11/ConfigureNotify/ConfigureNotify.m b/xts5/Xlib11/ConfigureNotify/ConfigureNotify.m
index 2c8948bb..2c8948bb 100644
--- a/xts5/tset/Xlib11/ConfigureNotify/ConfigureNotify.m
+++ b/xts5/Xlib11/ConfigureNotify/ConfigureNotify.m
diff --git a/xts5/tset/Xlib11/ConfigureRequest/ConfigureRequest.m b/xts5/Xlib11/ConfigureRequest/ConfigureRequest.m
index 30473693..30473693 100644
--- a/xts5/tset/Xlib11/ConfigureRequest/ConfigureRequest.m
+++ b/xts5/Xlib11/ConfigureRequest/ConfigureRequest.m
diff --git a/xts5/tset/Xlib11/CreateNotify/CreateNotify.m b/xts5/Xlib11/CreateNotify/CreateNotify.m
index 4d38bd30..4d38bd30 100644
--- a/xts5/tset/Xlib11/CreateNotify/CreateNotify.m
+++ b/xts5/Xlib11/CreateNotify/CreateNotify.m
diff --git a/xts5/tset/Xlib11/DestroyNotify/DestroyNotify.m b/xts5/Xlib11/DestroyNotify/DestroyNotify.m
index 4617068e..4617068e 100644
--- a/xts5/tset/Xlib11/DestroyNotify/DestroyNotify.m
+++ b/xts5/Xlib11/DestroyNotify/DestroyNotify.m
diff --git a/xts5/tset/Xlib11/EnterNotify/EnterNotify.m b/xts5/Xlib11/EnterNotify/EnterNotify.m
index 9531eb84..9531eb84 100644
--- a/xts5/tset/Xlib11/EnterNotify/EnterNotify.m
+++ b/xts5/Xlib11/EnterNotify/EnterNotify.m
diff --git a/xts5/tset/Xlib11/Expose/Expose.m b/xts5/Xlib11/Expose/Expose.m
index c17110f0..c17110f0 100644
--- a/xts5/tset/Xlib11/Expose/Expose.m
+++ b/xts5/Xlib11/Expose/Expose.m
diff --git a/xts5/tset/Xlib11/FocusIn/FocusIn.m b/xts5/Xlib11/FocusIn/FocusIn.m
index b86c06c8..b86c06c8 100644
--- a/xts5/tset/Xlib11/FocusIn/FocusIn.m
+++ b/xts5/Xlib11/FocusIn/FocusIn.m
diff --git a/xts5/tset/Xlib11/FocusOut/FocusOut.m b/xts5/Xlib11/FocusOut/FocusOut.m
index 82a9ee83..82a9ee83 100644
--- a/xts5/tset/Xlib11/FocusOut/FocusOut.m
+++ b/xts5/Xlib11/FocusOut/FocusOut.m
diff --git a/xts5/tset/Xlib11/GraphicsExpose/GraphicsExpose.m b/xts5/Xlib11/GraphicsExpose/GraphicsExpose.m
index 4fe9ee98..4fe9ee98 100644
--- a/xts5/tset/Xlib11/GraphicsExpose/GraphicsExpose.m
+++ b/xts5/Xlib11/GraphicsExpose/GraphicsExpose.m
diff --git a/xts5/tset/Xlib11/GravityNotify/GravityNotify.m b/xts5/Xlib11/GravityNotify/GravityNotify.m
index afd53635..afd53635 100644
--- a/xts5/tset/Xlib11/GravityNotify/GravityNotify.m
+++ b/xts5/Xlib11/GravityNotify/GravityNotify.m
diff --git a/xts5/tset/Xlib11/KeyPress/KeyPress.m b/xts5/Xlib11/KeyPress/KeyPress.m
index f541f3a4..f541f3a4 100644
--- a/xts5/tset/Xlib11/KeyPress/KeyPress.m
+++ b/xts5/Xlib11/KeyPress/KeyPress.m
diff --git a/xts5/tset/Xlib11/KeyRelease/KeyRelease.m b/xts5/Xlib11/KeyRelease/KeyRelease.m
index ef9a2e0e..ef9a2e0e 100644
--- a/xts5/tset/Xlib11/KeyRelease/KeyRelease.m
+++ b/xts5/Xlib11/KeyRelease/KeyRelease.m
diff --git a/xts5/tset/Xlib11/KeymapNotify/KeymapNotify.m b/xts5/Xlib11/KeymapNotify/KeymapNotify.m
index f68f550a..f68f550a 100644
--- a/xts5/tset/Xlib11/KeymapNotify/KeymapNotify.m
+++ b/xts5/Xlib11/KeymapNotify/KeymapNotify.m
diff --git a/xts5/tset/Xlib11/LeaveNotify/LeaveNotify.m b/xts5/Xlib11/LeaveNotify/LeaveNotify.m
index 7c9aa6f9..7c9aa6f9 100644
--- a/xts5/tset/Xlib11/LeaveNotify/LeaveNotify.m
+++ b/xts5/Xlib11/LeaveNotify/LeaveNotify.m
diff --git a/xts5/tset/Xlib11/Makefile.am b/xts5/Xlib11/Makefile.am
index b0168c6a..b0168c6a 100644
--- a/xts5/tset/Xlib11/Makefile.am
+++ b/xts5/Xlib11/Makefile.am
diff --git a/xts5/tset/Xlib11/MapNotify/MapNotify.m b/xts5/Xlib11/MapNotify/MapNotify.m
index 660bc738..660bc738 100644
--- a/xts5/tset/Xlib11/MapNotify/MapNotify.m
+++ b/xts5/Xlib11/MapNotify/MapNotify.m
diff --git a/xts5/tset/Xlib11/MapRequest/MapRequest.m b/xts5/Xlib11/MapRequest/MapRequest.m
index 303d74e8..303d74e8 100644
--- a/xts5/tset/Xlib11/MapRequest/MapRequest.m
+++ b/xts5/Xlib11/MapRequest/MapRequest.m
diff --git a/xts5/tset/Xlib11/MappingNotify/MappingNotify.m b/xts5/Xlib11/MappingNotify/MappingNotify.m
index e8c58ba4..e8c58ba4 100644
--- a/xts5/tset/Xlib11/MappingNotify/MappingNotify.m
+++ b/xts5/Xlib11/MappingNotify/MappingNotify.m
diff --git a/xts5/tset/Xlib11/MotionNotify/MotionNotify.m b/xts5/Xlib11/MotionNotify/MotionNotify.m
index e4f5c553..e4f5c553 100644
--- a/xts5/tset/Xlib11/MotionNotify/MotionNotify.m
+++ b/xts5/Xlib11/MotionNotify/MotionNotify.m
diff --git a/xts5/tset/Xlib11/NoExpose/NoExpose.m b/xts5/Xlib11/NoExpose/NoExpose.m
index 231de02c..231de02c 100644
--- a/xts5/tset/Xlib11/NoExpose/NoExpose.m
+++ b/xts5/Xlib11/NoExpose/NoExpose.m
diff --git a/xts5/tset/Xlib11/PropertyNotify/PropertyNotify.m b/xts5/Xlib11/PropertyNotify/PropertyNotify.m
index a817e822..a817e822 100644
--- a/xts5/tset/Xlib11/PropertyNotify/PropertyNotify.m
+++ b/xts5/Xlib11/PropertyNotify/PropertyNotify.m
diff --git a/xts5/tset/Xlib11/ReparentNotify/ReparentNotify.m b/xts5/Xlib11/ReparentNotify/ReparentNotify.m
index 4aa90aeb..4aa90aeb 100644
--- a/xts5/tset/Xlib11/ReparentNotify/ReparentNotify.m
+++ b/xts5/Xlib11/ReparentNotify/ReparentNotify.m
diff --git a/xts5/tset/Xlib11/ResizeRequest/ResizeRequest.m b/xts5/Xlib11/ResizeRequest/ResizeRequest.m
index db1d690d..db1d690d 100644
--- a/xts5/tset/Xlib11/ResizeRequest/ResizeRequest.m
+++ b/xts5/Xlib11/ResizeRequest/ResizeRequest.m
diff --git a/xts5/tset/Xlib11/SelectionClear/SelectionClear.m b/xts5/Xlib11/SelectionClear/SelectionClear.m
index 8b13cc2a..8b13cc2a 100644
--- a/xts5/tset/Xlib11/SelectionClear/SelectionClear.m
+++ b/xts5/Xlib11/SelectionClear/SelectionClear.m
diff --git a/xts5/tset/Xlib11/SelectionNotify/SelectionNotify.m b/xts5/Xlib11/SelectionNotify/SelectionNotify.m
index 86ad090e..86ad090e 100644
--- a/xts5/tset/Xlib11/SelectionNotify/SelectionNotify.m
+++ b/xts5/Xlib11/SelectionNotify/SelectionNotify.m
diff --git a/xts5/tset/Xlib11/SelectionRequest/SelectionRequest.m b/xts5/Xlib11/SelectionRequest/SelectionRequest.m
index fcc4f0fd..fcc4f0fd 100644
--- a/xts5/tset/Xlib11/SelectionRequest/SelectionRequest.m
+++ b/xts5/Xlib11/SelectionRequest/SelectionRequest.m
diff --git a/xts5/tset/Xlib11/UnmapNotify/UnmapNotify.m b/xts5/Xlib11/UnmapNotify/UnmapNotify.m
index e3e38082..e3e38082 100644
--- a/xts5/tset/Xlib11/UnmapNotify/UnmapNotify.m
+++ b/xts5/Xlib11/UnmapNotify/UnmapNotify.m
diff --git a/xts5/tset/Xlib11/VisibilityNotify/VisibilityNotify.m b/xts5/Xlib11/VisibilityNotify/VisibilityNotify.m
index f4863c9b..f4863c9b 100644
--- a/xts5/tset/Xlib11/VisibilityNotify/VisibilityNotify.m
+++ b/xts5/Xlib11/VisibilityNotify/VisibilityNotify.m
diff --git a/xts5/tset/Xlib12/.gitignore b/xts5/Xlib12/.gitignore
index ae15a2e1..ae15a2e1 100644
--- a/xts5/tset/Xlib12/.gitignore
+++ b/xts5/Xlib12/.gitignore
diff --git a/xts5/tset/Xlib12/Makefile.am b/xts5/Xlib12/Makefile.am
index 130ffb4c..130ffb4c 100644
--- a/xts5/tset/Xlib12/Makefile.am
+++ b/xts5/Xlib12/Makefile.am
diff --git a/xts5/tset/Xlib12/XCheckIfEvent/XCheckIfEvent.m b/xts5/Xlib12/XCheckIfEvent/XCheckIfEvent.m
index 6d29d91c..6d29d91c 100644
--- a/xts5/tset/Xlib12/XCheckIfEvent/XCheckIfEvent.m
+++ b/xts5/Xlib12/XCheckIfEvent/XCheckIfEvent.m
diff --git a/xts5/tset/Xlib12/XCheckMaskEvent/XCheckMaskEvent.m b/xts5/Xlib12/XCheckMaskEvent/XCheckMaskEvent.m
index ee41d1c6..ee41d1c6 100644
--- a/xts5/tset/Xlib12/XCheckMaskEvent/XCheckMaskEvent.m
+++ b/xts5/Xlib12/XCheckMaskEvent/XCheckMaskEvent.m
diff --git a/xts5/tset/Xlib12/XCheckTypedEvent/XCheckTypedEvent.m b/xts5/Xlib12/XCheckTypedEvent/XCheckTypedEvent.m
index f00e25a5..f00e25a5 100644
--- a/xts5/tset/Xlib12/XCheckTypedEvent/XCheckTypedEvent.m
+++ b/xts5/Xlib12/XCheckTypedEvent/XCheckTypedEvent.m
diff --git a/xts5/tset/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent.m b/xts5/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent.m
index 8679209e..8679209e 100644
--- a/xts5/tset/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent.m
+++ b/xts5/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent.m
diff --git a/xts5/tset/Xlib12/XCheckWindowEvent/XCheckWindowEvent.m b/xts5/Xlib12/XCheckWindowEvent/XCheckWindowEvent.m
index 38007846..38007846 100644
--- a/xts5/tset/Xlib12/XCheckWindowEvent/XCheckWindowEvent.m
+++ b/xts5/Xlib12/XCheckWindowEvent/XCheckWindowEvent.m
diff --git a/xts5/tset/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize.m b/xts5/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize.m
index 6721405b..6721405b 100644
--- a/xts5/tset/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize.m
+++ b/xts5/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize.m
diff --git a/xts5/tset/Xlib12/XDisplayName/Test1.c b/xts5/Xlib12/XDisplayName/Test1.c
index d70cc6c3..d70cc6c3 100644
--- a/xts5/tset/Xlib12/XDisplayName/Test1.c
+++ b/xts5/Xlib12/XDisplayName/Test1.c
diff --git a/xts5/tset/Xlib12/XDisplayName/XDisplayName.m b/xts5/Xlib12/XDisplayName/XDisplayName.m
index c9e3539f..c9e3539f 100644
--- a/xts5/tset/Xlib12/XDisplayName/XDisplayName.m
+++ b/xts5/Xlib12/XDisplayName/XDisplayName.m
diff --git a/xts5/tset/Xlib12/XEventsQueued/XEventsQueued.m b/xts5/Xlib12/XEventsQueued/XEventsQueued.m
index fa04f8fb..fa04f8fb 100644
--- a/xts5/tset/Xlib12/XEventsQueued/XEventsQueued.m
+++ b/xts5/Xlib12/XEventsQueued/XEventsQueued.m
diff --git a/xts5/tset/Xlib12/XFlush/XFlush.m b/xts5/Xlib12/XFlush/XFlush.m
index c66be8f4..c66be8f4 100644
--- a/xts5/tset/Xlib12/XFlush/XFlush.m
+++ b/xts5/Xlib12/XFlush/XFlush.m
diff --git a/xts5/tset/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText.m b/xts5/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText.m
index 13a7d2f2..13a7d2f2 100644
--- a/xts5/tset/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText.m
+++ b/xts5/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText.m
diff --git a/xts5/tset/Xlib12/XGetErrorText/XGetErrorText.m b/xts5/Xlib12/XGetErrorText/XGetErrorText.m
index 252591af..252591af 100644
--- a/xts5/tset/Xlib12/XGetErrorText/XGetErrorText.m
+++ b/xts5/Xlib12/XGetErrorText/XGetErrorText.m
diff --git a/xts5/tset/Xlib12/XGetMotionEvents/XGetMotionEvents.m b/xts5/Xlib12/XGetMotionEvents/XGetMotionEvents.m
index a7ee2156..a7ee2156 100644
--- a/xts5/tset/Xlib12/XGetMotionEvents/XGetMotionEvents.m
+++ b/xts5/Xlib12/XGetMotionEvents/XGetMotionEvents.m
diff --git a/xts5/tset/Xlib12/XIfEvent/XIfEvent.m b/xts5/Xlib12/XIfEvent/XIfEvent.m
index 95c280ce..95c280ce 100644
--- a/xts5/tset/Xlib12/XIfEvent/XIfEvent.m
+++ b/xts5/Xlib12/XIfEvent/XIfEvent.m
diff --git a/xts5/tset/Xlib12/XMaskEvent/XMaskEvent.m b/xts5/Xlib12/XMaskEvent/XMaskEvent.m
index e2e209be..e2e209be 100644
--- a/xts5/tset/Xlib12/XMaskEvent/XMaskEvent.m
+++ b/xts5/Xlib12/XMaskEvent/XMaskEvent.m
diff --git a/xts5/tset/Xlib12/XNextEvent/XNextEvent.m b/xts5/Xlib12/XNextEvent/XNextEvent.m
index cc42d908..cc42d908 100644
--- a/xts5/tset/Xlib12/XNextEvent/XNextEvent.m
+++ b/xts5/Xlib12/XNextEvent/XNextEvent.m
diff --git a/xts5/tset/Xlib12/XPeekEvent/XPeekEvent.m b/xts5/Xlib12/XPeekEvent/XPeekEvent.m
index 37d6a5c3..37d6a5c3 100644
--- a/xts5/tset/Xlib12/XPeekEvent/XPeekEvent.m
+++ b/xts5/Xlib12/XPeekEvent/XPeekEvent.m
diff --git a/xts5/tset/Xlib12/XPeekIfEvent/XPeekIfEvent.m b/xts5/Xlib12/XPeekIfEvent/XPeekIfEvent.m
index 32e1dff4..32e1dff4 100644
--- a/xts5/tset/Xlib12/XPeekIfEvent/XPeekIfEvent.m
+++ b/xts5/Xlib12/XPeekIfEvent/XPeekIfEvent.m
diff --git a/xts5/tset/Xlib12/XPending/XPending.m b/xts5/Xlib12/XPending/XPending.m
index 2aca1ddf..2aca1ddf 100644
--- a/xts5/tset/Xlib12/XPending/XPending.m
+++ b/xts5/Xlib12/XPending/XPending.m
diff --git a/xts5/tset/Xlib12/XPutBackEvent/XPutBackEvent.m b/xts5/Xlib12/XPutBackEvent/XPutBackEvent.m
index 0682f5d7..0682f5d7 100644
--- a/xts5/tset/Xlib12/XPutBackEvent/XPutBackEvent.m
+++ b/xts5/Xlib12/XPutBackEvent/XPutBackEvent.m
diff --git a/xts5/tset/Xlib12/XSelectInput/XSelectInput.m b/xts5/Xlib12/XSelectInput/XSelectInput.m
index 9ad761e3..9ad761e3 100644
--- a/xts5/tset/Xlib12/XSelectInput/XSelectInput.m
+++ b/xts5/Xlib12/XSelectInput/XSelectInput.m
diff --git a/xts5/tset/Xlib12/XSendEvent/XSendEvent.m b/xts5/Xlib12/XSendEvent/XSendEvent.m
index 22979e83..22979e83 100644
--- a/xts5/tset/Xlib12/XSendEvent/XSendEvent.m
+++ b/xts5/Xlib12/XSendEvent/XSendEvent.m
diff --git a/xts5/tset/Xlib12/XSetAfterFunction/XSetAfterFunction.m b/xts5/Xlib12/XSetAfterFunction/XSetAfterFunction.m
index f28fbbaa..f28fbbaa 100644
--- a/xts5/tset/Xlib12/XSetAfterFunction/XSetAfterFunction.m
+++ b/xts5/Xlib12/XSetAfterFunction/XSetAfterFunction.m
diff --git a/xts5/tset/Xlib12/XSetErrorHandler/XSetErrorHandler.m b/xts5/Xlib12/XSetErrorHandler/XSetErrorHandler.m
index f2847917..f2847917 100644
--- a/xts5/tset/Xlib12/XSetErrorHandler/XSetErrorHandler.m
+++ b/xts5/Xlib12/XSetErrorHandler/XSetErrorHandler.m
diff --git a/xts5/tset/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler.m b/xts5/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler.m
index a834a4ad..a834a4ad 100644
--- a/xts5/tset/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler.m
+++ b/xts5/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler.m
diff --git a/xts5/tset/Xlib12/XSync/XSync.m b/xts5/Xlib12/XSync/XSync.m
index d6e94b2c..d6e94b2c 100644
--- a/xts5/tset/Xlib12/XSync/XSync.m
+++ b/xts5/Xlib12/XSync/XSync.m
diff --git a/xts5/tset/Xlib12/XSynchronize/XSynchronize.m b/xts5/Xlib12/XSynchronize/XSynchronize.m
index f4dcecfa..f4dcecfa 100644
--- a/xts5/tset/Xlib12/XSynchronize/XSynchronize.m
+++ b/xts5/Xlib12/XSynchronize/XSynchronize.m
diff --git a/xts5/tset/Xlib12/XWindowEvent/XWindowEvent.m b/xts5/Xlib12/XWindowEvent/XWindowEvent.m
index 35016b31..35016b31 100644
--- a/xts5/tset/Xlib12/XWindowEvent/XWindowEvent.m
+++ b/xts5/Xlib12/XWindowEvent/XWindowEvent.m
diff --git a/xts5/tset/Xlib13/.gitignore b/xts5/Xlib13/.gitignore
index 63f0c3bb..63f0c3bb 100644
--- a/xts5/tset/Xlib13/.gitignore
+++ b/xts5/Xlib13/.gitignore
diff --git a/xts5/tset/Xlib13/Makefile.am b/xts5/Xlib13/Makefile.am
index b3157610..b3157610 100644
--- a/xts5/tset/Xlib13/Makefile.am
+++ b/xts5/Xlib13/Makefile.am
diff --git a/xts5/tset/Xlib13/XAllowEvents/XAllowEvents.m b/xts5/Xlib13/XAllowEvents/XAllowEvents.m
index f332e2a5..f332e2a5 100644
--- a/xts5/tset/Xlib13/XAllowEvents/XAllowEvents.m
+++ b/xts5/Xlib13/XAllowEvents/XAllowEvents.m
diff --git a/xts5/tset/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m b/xts5/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m
index e99add83..e99add83 100644
--- a/xts5/tset/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m
+++ b/xts5/Xlib13/XAutoRepeatOff/XAutoRepeatOff.m
diff --git a/xts5/tset/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m b/xts5/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m
index 43c8bc74..43c8bc74 100644
--- a/xts5/tset/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m
+++ b/xts5/Xlib13/XAutoRepeatOn/XAutoRepeatOn.m
diff --git a/xts5/tset/Xlib13/XBell/XBell.m b/xts5/Xlib13/XBell/XBell.m
index ebb55fdc..ebb55fdc 100644
--- a/xts5/tset/Xlib13/XBell/XBell.m
+++ b/xts5/Xlib13/XBell/XBell.m
diff --git a/xts5/tset/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m b/xts5/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m
index 50b8361b..50b8361b 100644
--- a/xts5/tset/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m
+++ b/xts5/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab.m
diff --git a/xts5/tset/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m b/xts5/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m
index 97065991..97065991 100644
--- a/xts5/tset/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m
+++ b/xts5/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl.m
diff --git a/xts5/tset/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m b/xts5/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m
index cba25272..cba25272 100644
--- a/xts5/tset/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m
+++ b/xts5/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping.m
diff --git a/xts5/tset/Xlib13/XChangePointerControl/XChangePointerControl.m b/xts5/Xlib13/XChangePointerControl/XChangePointerControl.m
index 9e0a00e3..9e0a00e3 100644
--- a/xts5/tset/Xlib13/XChangePointerControl/XChangePointerControl.m
+++ b/xts5/Xlib13/XChangePointerControl/XChangePointerControl.m
diff --git a/xts5/tset/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m b/xts5/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m
index 4c5b86fd..4c5b86fd 100644
--- a/xts5/tset/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m
+++ b/xts5/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry.m
diff --git a/xts5/tset/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m b/xts5/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m
index 2585ace3..2585ace3 100644
--- a/xts5/tset/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m
+++ b/xts5/Xlib13/XDisplayKeycodes/XDisplayKeycodes.m
diff --git a/xts5/tset/Xlib13/XFreeModifiermap/XFreeModifiermap.m b/xts5/Xlib13/XFreeModifiermap/XFreeModifiermap.m
index 43da2163..43da2163 100644
--- a/xts5/tset/Xlib13/XFreeModifiermap/XFreeModifiermap.m
+++ b/xts5/Xlib13/XFreeModifiermap/XFreeModifiermap.m
diff --git a/xts5/tset/Xlib13/XGetInputFocus/XGetInputFocus.m b/xts5/Xlib13/XGetInputFocus/XGetInputFocus.m
index c2de97a1..c2de97a1 100644
--- a/xts5/tset/Xlib13/XGetInputFocus/XGetInputFocus.m
+++ b/xts5/Xlib13/XGetInputFocus/XGetInputFocus.m
diff --git a/xts5/tset/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m b/xts5/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m
index 2bd9c185..2bd9c185 100644
--- a/xts5/tset/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m
+++ b/xts5/Xlib13/XGetKeyboardControl/XGetKeyboardControl.m
diff --git a/xts5/tset/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m b/xts5/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m
index ff2de8ec..ff2de8ec 100644
--- a/xts5/tset/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m
+++ b/xts5/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping.m
diff --git a/xts5/tset/Xlib13/XGetModifierMapping/XGetModifierMapping.m b/xts5/Xlib13/XGetModifierMapping/XGetModifierMapping.m
index f331674a..f331674a 100644
--- a/xts5/tset/Xlib13/XGetModifierMapping/XGetModifierMapping.m
+++ b/xts5/Xlib13/XGetModifierMapping/XGetModifierMapping.m
diff --git a/xts5/tset/Xlib13/XGetPointerControl/XGetPointerControl.m b/xts5/Xlib13/XGetPointerControl/XGetPointerControl.m
index 1bb66e78..1bb66e78 100644
--- a/xts5/tset/Xlib13/XGetPointerControl/XGetPointerControl.m
+++ b/xts5/Xlib13/XGetPointerControl/XGetPointerControl.m
diff --git a/xts5/tset/Xlib13/XGetPointerMapping/XGetPointerMapping.m b/xts5/Xlib13/XGetPointerMapping/XGetPointerMapping.m
index 4d44f985..4d44f985 100644
--- a/xts5/tset/Xlib13/XGetPointerMapping/XGetPointerMapping.m
+++ b/xts5/Xlib13/XGetPointerMapping/XGetPointerMapping.m
diff --git a/xts5/tset/Xlib13/XGrabButton/XGrabButton.m b/xts5/Xlib13/XGrabButton/XGrabButton.m
index 3a044aa6..3a044aa6 100644
--- a/xts5/tset/Xlib13/XGrabButton/XGrabButton.m
+++ b/xts5/Xlib13/XGrabButton/XGrabButton.m
diff --git a/xts5/tset/Xlib13/XGrabKey/XGrabKey.m b/xts5/Xlib13/XGrabKey/XGrabKey.m
index 22b39457..22b39457 100644
--- a/xts5/tset/Xlib13/XGrabKey/XGrabKey.m
+++ b/xts5/Xlib13/XGrabKey/XGrabKey.m
diff --git a/xts5/tset/Xlib13/XGrabKeyboard/XGrabKeyboard.m b/xts5/Xlib13/XGrabKeyboard/XGrabKeyboard.m
index 8080b579..8080b579 100644
--- a/xts5/tset/Xlib13/XGrabKeyboard/XGrabKeyboard.m
+++ b/xts5/Xlib13/XGrabKeyboard/XGrabKeyboard.m
diff --git a/xts5/tset/Xlib13/XGrabPointer/XGrabPointer.m b/xts5/Xlib13/XGrabPointer/XGrabPointer.m
index 7ab9e24c..7ab9e24c 100644
--- a/xts5/tset/Xlib13/XGrabPointer/XGrabPointer.m
+++ b/xts5/Xlib13/XGrabPointer/XGrabPointer.m
diff --git a/xts5/tset/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m b/xts5/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m
index 32b527b3..32b527b3 100644
--- a/xts5/tset/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m
+++ b/xts5/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry.m
diff --git a/xts5/tset/Xlib13/XNewModifiermap/XNewModifiermap.m b/xts5/Xlib13/XNewModifiermap/XNewModifiermap.m
index f4f83448..f4f83448 100644
--- a/xts5/tset/Xlib13/XNewModifiermap/XNewModifiermap.m
+++ b/xts5/Xlib13/XNewModifiermap/XNewModifiermap.m
diff --git a/xts5/tset/Xlib13/XQueryKeymap/XQueryKeymap.m b/xts5/Xlib13/XQueryKeymap/XQueryKeymap.m
index a1e62b69..a1e62b69 100644
--- a/xts5/tset/Xlib13/XQueryKeymap/XQueryKeymap.m
+++ b/xts5/Xlib13/XQueryKeymap/XQueryKeymap.m
diff --git a/xts5/tset/Xlib13/XSetInputFocus/XSetInputFocus.m b/xts5/Xlib13/XSetInputFocus/XSetInputFocus.m
index 39516a2b..39516a2b 100644
--- a/xts5/tset/Xlib13/XSetInputFocus/XSetInputFocus.m
+++ b/xts5/Xlib13/XSetInputFocus/XSetInputFocus.m
diff --git a/xts5/tset/Xlib13/XSetModifierMapping/XSetModifierMapping.m b/xts5/Xlib13/XSetModifierMapping/XSetModifierMapping.m
index f851a314..f851a314 100644
--- a/xts5/tset/Xlib13/XSetModifierMapping/XSetModifierMapping.m
+++ b/xts5/Xlib13/XSetModifierMapping/XSetModifierMapping.m
diff --git a/xts5/tset/Xlib13/XSetPointerMapping/XSetPointerMapping.m b/xts5/Xlib13/XSetPointerMapping/XSetPointerMapping.m
index 6505e979..6505e979 100644
--- a/xts5/tset/Xlib13/XSetPointerMapping/XSetPointerMapping.m
+++ b/xts5/Xlib13/XSetPointerMapping/XSetPointerMapping.m
diff --git a/xts5/tset/Xlib13/XUngrabButton/XUngrabButton.m b/xts5/Xlib13/XUngrabButton/XUngrabButton.m
index b0e327b6..b0e327b6 100644
--- a/xts5/tset/Xlib13/XUngrabButton/XUngrabButton.m
+++ b/xts5/Xlib13/XUngrabButton/XUngrabButton.m
diff --git a/xts5/tset/Xlib13/XUngrabKey/XUngrabKey.m b/xts5/Xlib13/XUngrabKey/XUngrabKey.m
index 1a575f7e..1a575f7e 100644
--- a/xts5/tset/Xlib13/XUngrabKey/XUngrabKey.m
+++ b/xts5/Xlib13/XUngrabKey/XUngrabKey.m
diff --git a/xts5/tset/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m b/xts5/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m
index 5f049765..5f049765 100644
--- a/xts5/tset/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m
+++ b/xts5/Xlib13/XUngrabKeyboard/XUngrabKeyboard.m
diff --git a/xts5/tset/Xlib13/XUngrabPointer/XUngrabPointer.m b/xts5/Xlib13/XUngrabPointer/XUngrabPointer.m
index 29107e59..29107e59 100644
--- a/xts5/tset/Xlib13/XUngrabPointer/XUngrabPointer.m
+++ b/xts5/Xlib13/XUngrabPointer/XUngrabPointer.m
diff --git a/xts5/tset/Xlib13/XWarpPointer/XWarpPointer.m b/xts5/Xlib13/XWarpPointer/XWarpPointer.m
index 977dbc5c..977dbc5c 100644
--- a/xts5/tset/Xlib13/XWarpPointer/XWarpPointer.m
+++ b/xts5/Xlib13/XWarpPointer/XWarpPointer.m
diff --git a/xts5/tset/Xlib14/.gitignore b/xts5/Xlib14/.gitignore
index 29846502..29846502 100644
--- a/xts5/tset/Xlib14/.gitignore
+++ b/xts5/Xlib14/.gitignore
diff --git a/xts5/tset/Xlib14/Makefile.am b/xts5/Xlib14/Makefile.am
index 37618c27..37618c27 100644
--- a/xts5/tset/Xlib14/Makefile.am
+++ b/xts5/Xlib14/Makefile.am
diff --git a/xts5/tset/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet.m b/xts5/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet.m
index 80e84ac7..80e84ac7 100644
--- a/xts5/tset/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet.m
+++ b/xts5/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet.m
diff --git a/xts5/tset/Xlib14/XCloseIM/XCloseIM.m b/xts5/Xlib14/XCloseIM/XCloseIM.m
index db003d5b..db003d5b 100644
--- a/xts5/tset/Xlib14/XCloseIM/XCloseIM.m
+++ b/xts5/Xlib14/XCloseIM/XCloseIM.m
diff --git a/xts5/tset/Xlib14/XContextDependentDrawing/XContextDependentDrawing.m b/xts5/Xlib14/XContextDependentDrawing/XContextDependentDrawing.m
index 399ffd7a..399ffd7a 100644
--- a/xts5/tset/Xlib14/XContextDependentDrawing/XContextDependentDrawing.m
+++ b/xts5/Xlib14/XContextDependentDrawing/XContextDependentDrawing.m
diff --git a/xts5/tset/Xlib14/XCreateFontSet/XCreateFontSet.m b/xts5/Xlib14/XCreateFontSet/XCreateFontSet.m
index 1db827b6..1db827b6 100644
--- a/xts5/tset/Xlib14/XCreateFontSet/XCreateFontSet.m
+++ b/xts5/Xlib14/XCreateFontSet/XCreateFontSet.m
diff --git a/xts5/tset/Xlib14/XCreateIC/XCreateIC.m b/xts5/Xlib14/XCreateIC/XCreateIC.m
index 8ae9da93..8ae9da93 100644
--- a/xts5/tset/Xlib14/XCreateIC/XCreateIC.m
+++ b/xts5/Xlib14/XCreateIC/XCreateIC.m
diff --git a/xts5/tset/Xlib14/XDestroyIC/XDestroyIC.m b/xts5/Xlib14/XDestroyIC/XDestroyIC.m
index 1d81707f..1d81707f 100644
--- a/xts5/tset/Xlib14/XDestroyIC/XDestroyIC.m
+++ b/xts5/Xlib14/XDestroyIC/XDestroyIC.m
diff --git a/xts5/tset/Xlib14/XDisplayOfIM/XDisplayOfIM.m b/xts5/Xlib14/XDisplayOfIM/XDisplayOfIM.m
index e2f8e54c..e2f8e54c 100644
--- a/xts5/tset/Xlib14/XDisplayOfIM/XDisplayOfIM.m
+++ b/xts5/Xlib14/XDisplayOfIM/XDisplayOfIM.m
diff --git a/xts5/tset/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet.m b/xts5/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet.m
index c3e18be8..c3e18be8 100644
--- a/xts5/tset/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet.m
+++ b/xts5/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet.m
diff --git a/xts5/tset/Xlib14/XFilterEvent/XFilterEvent.m b/xts5/Xlib14/XFilterEvent/XFilterEvent.m
index d0346615..d0346615 100644
--- a/xts5/tset/Xlib14/XFilterEvent/XFilterEvent.m
+++ b/xts5/Xlib14/XFilterEvent/XFilterEvent.m
diff --git a/xts5/tset/Xlib14/XFontsOfFontSet/XFontsOfFontSet.m b/xts5/Xlib14/XFontsOfFontSet/XFontsOfFontSet.m
index c792ca5e..c792ca5e 100644
--- a/xts5/tset/Xlib14/XFontsOfFontSet/XFontsOfFontSet.m
+++ b/xts5/Xlib14/XFontsOfFontSet/XFontsOfFontSet.m
diff --git a/xts5/tset/Xlib14/XFreeFontSet/XFreeFontSet.m b/xts5/Xlib14/XFreeFontSet/XFreeFontSet.m
index ff7104fa..ff7104fa 100644
--- a/xts5/tset/Xlib14/XFreeFontSet/XFreeFontSet.m
+++ b/xts5/Xlib14/XFreeFontSet/XFreeFontSet.m
diff --git a/xts5/tset/Xlib14/XGetICValues/XGetICValues.m b/xts5/Xlib14/XGetICValues/XGetICValues.m
index f90b1f72..f90b1f72 100644
--- a/xts5/tset/Xlib14/XGetICValues/XGetICValues.m
+++ b/xts5/Xlib14/XGetICValues/XGetICValues.m
diff --git a/xts5/tset/Xlib14/XGetIMValues/XGetIMValues.m b/xts5/Xlib14/XGetIMValues/XGetIMValues.m
index 608186c0..608186c0 100644
--- a/xts5/tset/Xlib14/XGetIMValues/XGetIMValues.m
+++ b/xts5/Xlib14/XGetIMValues/XGetIMValues.m
diff --git a/xts5/tset/Xlib14/XIMOfIC/XIMOfIC.m b/xts5/Xlib14/XIMOfIC/XIMOfIC.m
index 2b5139a6..2b5139a6 100644
--- a/xts5/tset/Xlib14/XIMOfIC/XIMOfIC.m
+++ b/xts5/Xlib14/XIMOfIC/XIMOfIC.m
diff --git a/xts5/tset/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet.m b/xts5/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet.m
index 67acfb99..67acfb99 100644
--- a/xts5/tset/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet.m
+++ b/xts5/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet.m
diff --git a/xts5/tset/Xlib14/XLocaleOfIM/XLocaleOfIM.m b/xts5/Xlib14/XLocaleOfIM/XLocaleOfIM.m
index ced04713..ced04713 100644
--- a/xts5/tset/Xlib14/XLocaleOfIM/XLocaleOfIM.m
+++ b/xts5/Xlib14/XLocaleOfIM/XLocaleOfIM.m
diff --git a/xts5/tset/Xlib14/XOpenIM/XOpenIM.m b/xts5/Xlib14/XOpenIM/XOpenIM.m
index 863123e7..863123e7 100644
--- a/xts5/tset/Xlib14/XOpenIM/XOpenIM.m
+++ b/xts5/Xlib14/XOpenIM/XOpenIM.m
diff --git a/xts5/tset/Xlib14/XSetICFocus/XSetICFocus.m b/xts5/Xlib14/XSetICFocus/XSetICFocus.m
index 5b99b8ce..5b99b8ce 100644
--- a/xts5/tset/Xlib14/XSetICFocus/XSetICFocus.m
+++ b/xts5/Xlib14/XSetICFocus/XSetICFocus.m
diff --git a/xts5/tset/Xlib14/XSetICValues/XSetICValues.m b/xts5/Xlib14/XSetICValues/XSetICValues.m
index 7586491a..7586491a 100644
--- a/xts5/tset/Xlib14/XSetICValues/XSetICValues.m
+++ b/xts5/Xlib14/XSetICValues/XSetICValues.m
diff --git a/xts5/tset/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers.m b/xts5/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers.m
index 0abdab71..0abdab71 100644
--- a/xts5/tset/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers.m
+++ b/xts5/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers.m
diff --git a/xts5/tset/Xlib14/XSupportsLocale/XSupportsLocale.m b/xts5/Xlib14/XSupportsLocale/XSupportsLocale.m
index ea43fad7..ea43fad7 100644
--- a/xts5/tset/Xlib14/XSupportsLocale/XSupportsLocale.m
+++ b/xts5/Xlib14/XSupportsLocale/XSupportsLocale.m
diff --git a/xts5/tset/Xlib14/XUnsetICFocus/XUnsetICFocus.m b/xts5/Xlib14/XUnsetICFocus/XUnsetICFocus.m
index da6c87ab..da6c87ab 100644
--- a/xts5/tset/Xlib14/XUnsetICFocus/XUnsetICFocus.m
+++ b/xts5/Xlib14/XUnsetICFocus/XUnsetICFocus.m
diff --git a/xts5/tset/Xlib14/XVaCreateNestedList/XVaCreateNestedList.m b/xts5/Xlib14/XVaCreateNestedList/XVaCreateNestedList.m
index 96a728fa..96a728fa 100644
--- a/xts5/tset/Xlib14/XVaCreateNestedList/XVaCreateNestedList.m
+++ b/xts5/Xlib14/XVaCreateNestedList/XVaCreateNestedList.m
diff --git a/xts5/tset/Xlib14/XmbDrawImageString/XmbDrawImageString.m b/xts5/Xlib14/XmbDrawImageString/XmbDrawImageString.m
index 7f793476..7f793476 100644
--- a/xts5/tset/Xlib14/XmbDrawImageString/XmbDrawImageString.m
+++ b/xts5/Xlib14/XmbDrawImageString/XmbDrawImageString.m
diff --git a/xts5/tset/Xlib14/XmbDrawImageString/a1.C.dat b/xts5/Xlib14/XmbDrawImageString/a1.C.dat
index 3da5f7ad..3da5f7ad 100644
--- a/xts5/tset/Xlib14/XmbDrawImageString/a1.C.dat
+++ b/xts5/Xlib14/XmbDrawImageString/a1.C.dat
diff --git a/xts5/tset/Xlib14/XmbDrawImageString/a1.ko.dat b/xts5/Xlib14/XmbDrawImageString/a1.ko.dat
index 37629572..37629572 100644
--- a/xts5/tset/Xlib14/XmbDrawImageString/a1.ko.dat
+++ b/xts5/Xlib14/XmbDrawImageString/a1.ko.dat
diff --git a/xts5/tset/Xlib14/XmbDrawString/XmbDrawString.m b/xts5/Xlib14/XmbDrawString/XmbDrawString.m
index 9010b412..9010b412 100644
--- a/xts5/tset/Xlib14/XmbDrawString/XmbDrawString.m
+++ b/xts5/Xlib14/XmbDrawString/XmbDrawString.m
diff --git a/xts5/tset/Xlib14/XmbDrawString/a1.C.dat b/xts5/Xlib14/XmbDrawString/a1.C.dat
index dbd6304c..dbd6304c 100644
--- a/xts5/tset/Xlib14/XmbDrawString/a1.C.dat
+++ b/xts5/Xlib14/XmbDrawString/a1.C.dat
diff --git a/xts5/tset/Xlib14/XmbDrawString/a1.ko.dat b/xts5/Xlib14/XmbDrawString/a1.ko.dat
index 9bb1904e..9bb1904e 100644
--- a/xts5/tset/Xlib14/XmbDrawString/a1.ko.dat
+++ b/xts5/Xlib14/XmbDrawString/a1.ko.dat
diff --git a/xts5/tset/Xlib14/XmbDrawText/XmbDrawText.m b/xts5/Xlib14/XmbDrawText/XmbDrawText.m
index e22fc47b..e22fc47b 100644
--- a/xts5/tset/Xlib14/XmbDrawText/XmbDrawText.m
+++ b/xts5/Xlib14/XmbDrawText/XmbDrawText.m
diff --git a/xts5/tset/Xlib14/XmbDrawText/a1.C.dat b/xts5/Xlib14/XmbDrawText/a1.C.dat
index d4d880d5..d4d880d5 100644
--- a/xts5/tset/Xlib14/XmbDrawText/a1.C.dat
+++ b/xts5/Xlib14/XmbDrawText/a1.C.dat
diff --git a/xts5/tset/Xlib14/XmbDrawText/a1.ko.dat b/xts5/Xlib14/XmbDrawText/a1.ko.dat
index fbcbdb98..fbcbdb98 100644
--- a/xts5/tset/Xlib14/XmbDrawText/a1.ko.dat
+++ b/xts5/Xlib14/XmbDrawText/a1.ko.dat
diff --git a/xts5/tset/Xlib14/XmbLookupString/XmbLookupString.m b/xts5/Xlib14/XmbLookupString/XmbLookupString.m
index 238093a3..238093a3 100644
--- a/xts5/tset/Xlib14/XmbLookupString/XmbLookupString.m
+++ b/xts5/Xlib14/XmbLookupString/XmbLookupString.m
diff --git a/xts5/tset/Xlib14/XmbResetIC/XmbResetIC.m b/xts5/Xlib14/XmbResetIC/XmbResetIC.m
index 7a07284e..7a07284e 100644
--- a/xts5/tset/Xlib14/XmbResetIC/XmbResetIC.m
+++ b/xts5/Xlib14/XmbResetIC/XmbResetIC.m
diff --git a/xts5/tset/Xlib14/XmbSetWMProperties/XmbSetWMProperties.m b/xts5/Xlib14/XmbSetWMProperties/XmbSetWMProperties.m
index 5e0a6b1c..5e0a6b1c 100644
--- a/xts5/tset/Xlib14/XmbSetWMProperties/XmbSetWMProperties.m
+++ b/xts5/Xlib14/XmbSetWMProperties/XmbSetWMProperties.m
diff --git a/xts5/tset/Xlib14/XmbTextEscapement/XmbTextEscapement.m b/xts5/Xlib14/XmbTextEscapement/XmbTextEscapement.m
index 7c511564..7c511564 100644
--- a/xts5/tset/Xlib14/XmbTextEscapement/XmbTextEscapement.m
+++ b/xts5/Xlib14/XmbTextEscapement/XmbTextEscapement.m
diff --git a/xts5/tset/Xlib14/XmbTextExtents/XmbTextExtents.m b/xts5/Xlib14/XmbTextExtents/XmbTextExtents.m
index 9ab9db91..9ab9db91 100644
--- a/xts5/tset/Xlib14/XmbTextExtents/XmbTextExtents.m
+++ b/xts5/Xlib14/XmbTextExtents/XmbTextExtents.m
diff --git a/xts5/tset/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty.m b/xts5/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty.m
index bc573f7c..bc573f7c 100644
--- a/xts5/tset/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty.m
+++ b/xts5/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty.m
diff --git a/xts5/tset/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents.m b/xts5/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents.m
index 61273ed9..61273ed9 100644
--- a/xts5/tset/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents.m
+++ b/xts5/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents.m
diff --git a/xts5/tset/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList.m b/xts5/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList.m
index 3fff31a1..3fff31a1 100644
--- a/xts5/tset/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList.m
+++ b/xts5/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList.m
diff --git a/xts5/tset/Xlib14/XwcDrawImageString/XwcDrawImageString.m b/xts5/Xlib14/XwcDrawImageString/XwcDrawImageString.m
index 101fcde2..101fcde2 100644
--- a/xts5/tset/Xlib14/XwcDrawImageString/XwcDrawImageString.m
+++ b/xts5/Xlib14/XwcDrawImageString/XwcDrawImageString.m
diff --git a/xts5/tset/Xlib14/XwcDrawImageString/a1.C.dat b/xts5/Xlib14/XwcDrawImageString/a1.C.dat
index 3da5f7ad..3da5f7ad 100644
--- a/xts5/tset/Xlib14/XwcDrawImageString/a1.C.dat
+++ b/xts5/Xlib14/XwcDrawImageString/a1.C.dat
diff --git a/xts5/tset/Xlib14/XwcDrawImageString/a1.ko.dat b/xts5/Xlib14/XwcDrawImageString/a1.ko.dat
index c0e56813..c0e56813 100644
--- a/xts5/tset/Xlib14/XwcDrawImageString/a1.ko.dat
+++ b/xts5/Xlib14/XwcDrawImageString/a1.ko.dat
diff --git a/xts5/tset/Xlib14/XwcDrawString/XwcDrawString.m b/xts5/Xlib14/XwcDrawString/XwcDrawString.m
index 41c4e626..41c4e626 100644
--- a/xts5/tset/Xlib14/XwcDrawString/XwcDrawString.m
+++ b/xts5/Xlib14/XwcDrawString/XwcDrawString.m
diff --git a/xts5/tset/Xlib14/XwcDrawString/a1.C.dat b/xts5/Xlib14/XwcDrawString/a1.C.dat
index dbd6304c..dbd6304c 100644
--- a/xts5/tset/Xlib14/XwcDrawString/a1.C.dat
+++ b/xts5/Xlib14/XwcDrawString/a1.C.dat
diff --git a/xts5/tset/Xlib14/XwcDrawString/a1.ko.dat b/xts5/Xlib14/XwcDrawString/a1.ko.dat
index 44baaed7..44baaed7 100644
--- a/xts5/tset/Xlib14/XwcDrawString/a1.ko.dat
+++ b/xts5/Xlib14/XwcDrawString/a1.ko.dat
diff --git a/xts5/tset/Xlib14/XwcDrawText/XwcDrawText.m b/xts5/Xlib14/XwcDrawText/XwcDrawText.m
index fb8524fd..fb8524fd 100644
--- a/xts5/tset/Xlib14/XwcDrawText/XwcDrawText.m
+++ b/xts5/Xlib14/XwcDrawText/XwcDrawText.m
diff --git a/xts5/tset/Xlib14/XwcDrawText/a1.C.dat b/xts5/Xlib14/XwcDrawText/a1.C.dat
index deba1c7c..deba1c7c 100644
--- a/xts5/tset/Xlib14/XwcDrawText/a1.C.dat
+++ b/xts5/Xlib14/XwcDrawText/a1.C.dat
diff --git a/xts5/tset/Xlib14/XwcDrawText/a1.ko.dat b/xts5/Xlib14/XwcDrawText/a1.ko.dat
index bef98856..bef98856 100644
--- a/xts5/tset/Xlib14/XwcDrawText/a1.ko.dat
+++ b/xts5/Xlib14/XwcDrawText/a1.ko.dat
diff --git a/xts5/tset/Xlib14/XwcFreeStringList/XwcFreeStringList.m b/xts5/Xlib14/XwcFreeStringList/XwcFreeStringList.m
index 64533818..64533818 100644
--- a/xts5/tset/Xlib14/XwcFreeStringList/XwcFreeStringList.m
+++ b/xts5/Xlib14/XwcFreeStringList/XwcFreeStringList.m
diff --git a/xts5/tset/Xlib14/XwcLookupString/XwcLookupString.m b/xts5/Xlib14/XwcLookupString/XwcLookupString.m
index db8cd417..db8cd417 100644
--- a/xts5/tset/Xlib14/XwcLookupString/XwcLookupString.m
+++ b/xts5/Xlib14/XwcLookupString/XwcLookupString.m
diff --git a/xts5/tset/Xlib14/XwcResetIC/XwcResetIC.m b/xts5/Xlib14/XwcResetIC/XwcResetIC.m
index 4dfc2832..4dfc2832 100644
--- a/xts5/tset/Xlib14/XwcResetIC/XwcResetIC.m
+++ b/xts5/Xlib14/XwcResetIC/XwcResetIC.m
diff --git a/xts5/tset/Xlib14/XwcTextEscapement/XwcTextEscapement.m b/xts5/Xlib14/XwcTextEscapement/XwcTextEscapement.m
index 77cd2bf5..77cd2bf5 100644
--- a/xts5/tset/Xlib14/XwcTextEscapement/XwcTextEscapement.m
+++ b/xts5/Xlib14/XwcTextEscapement/XwcTextEscapement.m
diff --git a/xts5/tset/Xlib14/XwcTextExtents/XwcTextExtents.m b/xts5/Xlib14/XwcTextExtents/XwcTextExtents.m
index c7ec4f48..c7ec4f48 100644
--- a/xts5/tset/Xlib14/XwcTextExtents/XwcTextExtents.m
+++ b/xts5/Xlib14/XwcTextExtents/XwcTextExtents.m
diff --git a/xts5/tset/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty.m b/xts5/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty.m
index c382bfe0..c382bfe0 100644
--- a/xts5/tset/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty.m
+++ b/xts5/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty.m
diff --git a/xts5/tset/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents.m b/xts5/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents.m
index 6b4424d7..6b4424d7 100644
--- a/xts5/tset/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents.m
+++ b/xts5/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents.m
diff --git a/xts5/tset/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList.m b/xts5/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList.m
index 628a3375..628a3375 100644
--- a/xts5/tset/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList.m
+++ b/xts5/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList.m
diff --git a/xts5/tset/Xlib15/.gitignore b/xts5/Xlib15/.gitignore
index 9ddd0ec5..9ddd0ec5 100644
--- a/xts5/tset/Xlib15/.gitignore
+++ b/xts5/Xlib15/.gitignore
diff --git a/xts5/tset/Xlib15/Makefile.am b/xts5/Xlib15/Makefile.am
index c557b1ee..c557b1ee 100644
--- a/xts5/tset/Xlib15/Makefile.am
+++ b/xts5/Xlib15/Makefile.am
diff --git a/xts5/tset/Xlib15/XAllocClassHint/XAllocClassHint.m b/xts5/Xlib15/XAllocClassHint/XAllocClassHint.m
index 69ab73e2..69ab73e2 100644
--- a/xts5/tset/Xlib15/XAllocClassHint/XAllocClassHint.m
+++ b/xts5/Xlib15/XAllocClassHint/XAllocClassHint.m
diff --git a/xts5/tset/Xlib15/XAllocIconSize/XAllocIconSize.m b/xts5/Xlib15/XAllocIconSize/XAllocIconSize.m
index bfbe5436..bfbe5436 100644
--- a/xts5/tset/Xlib15/XAllocIconSize/XAllocIconSize.m
+++ b/xts5/Xlib15/XAllocIconSize/XAllocIconSize.m
diff --git a/xts5/tset/Xlib15/XAllocSizeHints/XAllocSizeHints.m b/xts5/Xlib15/XAllocSizeHints/XAllocSizeHints.m
index 3969d472..3969d472 100644
--- a/xts5/tset/Xlib15/XAllocSizeHints/XAllocSizeHints.m
+++ b/xts5/Xlib15/XAllocSizeHints/XAllocSizeHints.m
diff --git a/xts5/tset/Xlib15/XAllocStandardColormap/XAllocStandardColormap.m b/xts5/Xlib15/XAllocStandardColormap/XAllocStandardColormap.m
index d0d3e1af..d0d3e1af 100644
--- a/xts5/tset/Xlib15/XAllocStandardColormap/XAllocStandardColormap.m
+++ b/xts5/Xlib15/XAllocStandardColormap/XAllocStandardColormap.m
diff --git a/xts5/tset/Xlib15/XAllocWMHints/XAllocWMHints.m b/xts5/Xlib15/XAllocWMHints/XAllocWMHints.m
index 9df171c1..9df171c1 100644
--- a/xts5/tset/Xlib15/XAllocWMHints/XAllocWMHints.m
+++ b/xts5/Xlib15/XAllocWMHints/XAllocWMHints.m
diff --git a/xts5/tset/Xlib15/XDefaultString/XDefaultString.m b/xts5/Xlib15/XDefaultString/XDefaultString.m
index d28f9401..d28f9401 100644
--- a/xts5/tset/Xlib15/XDefaultString/XDefaultString.m
+++ b/xts5/Xlib15/XDefaultString/XDefaultString.m
diff --git a/xts5/tset/Xlib15/XFetchName/XFetchName.m b/xts5/Xlib15/XFetchName/XFetchName.m
index da59b6c4..da59b6c4 100644
--- a/xts5/tset/Xlib15/XFetchName/XFetchName.m
+++ b/xts5/Xlib15/XFetchName/XFetchName.m
diff --git a/xts5/tset/Xlib15/XFreeStringList/XFreeStringList.m b/xts5/Xlib15/XFreeStringList/XFreeStringList.m
index 9a0fe233..9a0fe233 100644
--- a/xts5/tset/Xlib15/XFreeStringList/XFreeStringList.m
+++ b/xts5/Xlib15/XFreeStringList/XFreeStringList.m
diff --git a/xts5/tset/Xlib15/XGetClassHint/XGetClassHint.m b/xts5/Xlib15/XGetClassHint/XGetClassHint.m
index 9bb39cb7..9bb39cb7 100644
--- a/xts5/tset/Xlib15/XGetClassHint/XGetClassHint.m
+++ b/xts5/Xlib15/XGetClassHint/XGetClassHint.m
diff --git a/xts5/tset/Xlib15/XGetCommand/XGetCommand.m b/xts5/Xlib15/XGetCommand/XGetCommand.m
index 9e1755cf..9e1755cf 100644
--- a/xts5/tset/Xlib15/XGetCommand/XGetCommand.m
+++ b/xts5/Xlib15/XGetCommand/XGetCommand.m
diff --git a/xts5/tset/Xlib15/XGetIconName/XGetIconName.m b/xts5/Xlib15/XGetIconName/XGetIconName.m
index e97a2c86..e97a2c86 100644
--- a/xts5/tset/Xlib15/XGetIconName/XGetIconName.m
+++ b/xts5/Xlib15/XGetIconName/XGetIconName.m
diff --git a/xts5/tset/Xlib15/XGetIconSizes/XGetIconSizes.m b/xts5/Xlib15/XGetIconSizes/XGetIconSizes.m
index 9579fec0..9579fec0 100644
--- a/xts5/tset/Xlib15/XGetIconSizes/XGetIconSizes.m
+++ b/xts5/Xlib15/XGetIconSizes/XGetIconSizes.m
diff --git a/xts5/tset/Xlib15/XGetRGBColormaps/XGetRGBColormaps.m b/xts5/Xlib15/XGetRGBColormaps/XGetRGBColormaps.m
index 49af0e5d..49af0e5d 100644
--- a/xts5/tset/Xlib15/XGetRGBColormaps/XGetRGBColormaps.m
+++ b/xts5/Xlib15/XGetRGBColormaps/XGetRGBColormaps.m
diff --git a/xts5/tset/Xlib15/XGetTextProperty/XGetTextProperty.m b/xts5/Xlib15/XGetTextProperty/XGetTextProperty.m
index e78fb485..e78fb485 100644
--- a/xts5/tset/Xlib15/XGetTextProperty/XGetTextProperty.m
+++ b/xts5/Xlib15/XGetTextProperty/XGetTextProperty.m
diff --git a/xts5/tset/Xlib15/XGetTransientForHint/XGetTransientForHint.m b/xts5/Xlib15/XGetTransientForHint/XGetTransientForHint.m
index 720d6b8f..720d6b8f 100644
--- a/xts5/tset/Xlib15/XGetTransientForHint/XGetTransientForHint.m
+++ b/xts5/Xlib15/XGetTransientForHint/XGetTransientForHint.m
diff --git a/xts5/tset/Xlib15/XGetWMClientMachine/XGetWMClientMachine.m b/xts5/Xlib15/XGetWMClientMachine/XGetWMClientMachine.m
index 951789f8..951789f8 100644
--- a/xts5/tset/Xlib15/XGetWMClientMachine/XGetWMClientMachine.m
+++ b/xts5/Xlib15/XGetWMClientMachine/XGetWMClientMachine.m
diff --git a/xts5/tset/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows.m b/xts5/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows.m
index 4e96ef4c..4e96ef4c 100644
--- a/xts5/tset/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows.m
+++ b/xts5/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows.m
diff --git a/xts5/tset/Xlib15/XGetWMHints/XGetWMHints.m b/xts5/Xlib15/XGetWMHints/XGetWMHints.m
index 07ce233e..07ce233e 100644
--- a/xts5/tset/Xlib15/XGetWMHints/XGetWMHints.m
+++ b/xts5/Xlib15/XGetWMHints/XGetWMHints.m
diff --git a/xts5/tset/Xlib15/XGetWMIconName/XGetWMIconName.m b/xts5/Xlib15/XGetWMIconName/XGetWMIconName.m
index 6564645a..6564645a 100644
--- a/xts5/tset/Xlib15/XGetWMIconName/XGetWMIconName.m
+++ b/xts5/Xlib15/XGetWMIconName/XGetWMIconName.m
diff --git a/xts5/tset/Xlib15/XGetWMName/XGetWMName.m b/xts5/Xlib15/XGetWMName/XGetWMName.m
index 25ccfb10..25ccfb10 100644
--- a/xts5/tset/Xlib15/XGetWMName/XGetWMName.m
+++ b/xts5/Xlib15/XGetWMName/XGetWMName.m
diff --git a/xts5/tset/Xlib15/XGetWMNormalHints/XGetWMNormalHints.m b/xts5/Xlib15/XGetWMNormalHints/XGetWMNormalHints.m
index c705fd03..c705fd03 100644
--- a/xts5/tset/Xlib15/XGetWMNormalHints/XGetWMNormalHints.m
+++ b/xts5/Xlib15/XGetWMNormalHints/XGetWMNormalHints.m
diff --git a/xts5/tset/Xlib15/XGetWMProtocols/XGetWMProtocols.m b/xts5/Xlib15/XGetWMProtocols/XGetWMProtocols.m
index 226ebccf..226ebccf 100644
--- a/xts5/tset/Xlib15/XGetWMProtocols/XGetWMProtocols.m
+++ b/xts5/Xlib15/XGetWMProtocols/XGetWMProtocols.m
diff --git a/xts5/tset/Xlib15/XGetWMSizeHints/XGetWMSizeHints.m b/xts5/Xlib15/XGetWMSizeHints/XGetWMSizeHints.m
index e640cae7..e640cae7 100644
--- a/xts5/tset/Xlib15/XGetWMSizeHints/XGetWMSizeHints.m
+++ b/xts5/Xlib15/XGetWMSizeHints/XGetWMSizeHints.m
diff --git a/xts5/tset/Xlib15/XIconifyWindow/XIconifyWindow.m b/xts5/Xlib15/XIconifyWindow/XIconifyWindow.m
index 1401e762..1401e762 100644
--- a/xts5/tset/Xlib15/XIconifyWindow/XIconifyWindow.m
+++ b/xts5/Xlib15/XIconifyWindow/XIconifyWindow.m
diff --git a/xts5/tset/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow.m b/xts5/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow.m
index ad1f1dc4..ad1f1dc4 100644
--- a/xts5/tset/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow.m
+++ b/xts5/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow.m
diff --git a/xts5/tset/Xlib15/XSetClassHint/XSetClassHint.m b/xts5/Xlib15/XSetClassHint/XSetClassHint.m
index a1aaeb29..a1aaeb29 100644
--- a/xts5/tset/Xlib15/XSetClassHint/XSetClassHint.m
+++ b/xts5/Xlib15/XSetClassHint/XSetClassHint.m
diff --git a/xts5/tset/Xlib15/XSetCommand/XSetCommand.m b/xts5/Xlib15/XSetCommand/XSetCommand.m
index 98ca9e38..98ca9e38 100644
--- a/xts5/tset/Xlib15/XSetCommand/XSetCommand.m
+++ b/xts5/Xlib15/XSetCommand/XSetCommand.m
diff --git a/xts5/tset/Xlib15/XSetIconName/XSetIconName.m b/xts5/Xlib15/XSetIconName/XSetIconName.m
index 7802caa9..7802caa9 100644
--- a/xts5/tset/Xlib15/XSetIconName/XSetIconName.m
+++ b/xts5/Xlib15/XSetIconName/XSetIconName.m
diff --git a/xts5/tset/Xlib15/XSetIconSizes/XSetIconSizes.m b/xts5/Xlib15/XSetIconSizes/XSetIconSizes.m
index b206ae6c..b206ae6c 100644
--- a/xts5/tset/Xlib15/XSetIconSizes/XSetIconSizes.m
+++ b/xts5/Xlib15/XSetIconSizes/XSetIconSizes.m
diff --git a/xts5/tset/Xlib15/XSetRGBColormaps/XSetRGBColormaps.m b/xts5/Xlib15/XSetRGBColormaps/XSetRGBColormaps.m
index dccc9ed0..dccc9ed0 100644
--- a/xts5/tset/Xlib15/XSetRGBColormaps/XSetRGBColormaps.m
+++ b/xts5/Xlib15/XSetRGBColormaps/XSetRGBColormaps.m
diff --git a/xts5/tset/Xlib15/XSetTextProperty/XSetTextProperty.m b/xts5/Xlib15/XSetTextProperty/XSetTextProperty.m
index 4b3bbcbe..4b3bbcbe 100644
--- a/xts5/tset/Xlib15/XSetTextProperty/XSetTextProperty.m
+++ b/xts5/Xlib15/XSetTextProperty/XSetTextProperty.m
diff --git a/xts5/tset/Xlib15/XSetTransientForHint/XSetTransientForHint.m b/xts5/Xlib15/XSetTransientForHint/XSetTransientForHint.m
index 410dd984..410dd984 100644
--- a/xts5/tset/Xlib15/XSetTransientForHint/XSetTransientForHint.m
+++ b/xts5/Xlib15/XSetTransientForHint/XSetTransientForHint.m
diff --git a/xts5/tset/Xlib15/XSetWMClientMachine/XSetWMClientMachine.m b/xts5/Xlib15/XSetWMClientMachine/XSetWMClientMachine.m
index ac3b4e48..ac3b4e48 100644
--- a/xts5/tset/Xlib15/XSetWMClientMachine/XSetWMClientMachine.m
+++ b/xts5/Xlib15/XSetWMClientMachine/XSetWMClientMachine.m
diff --git a/xts5/tset/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows.m b/xts5/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows.m
index a8e7b45c..a8e7b45c 100644
--- a/xts5/tset/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows.m
+++ b/xts5/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows.m
diff --git a/xts5/tset/Xlib15/XSetWMHints/XSetWMHints.m b/xts5/Xlib15/XSetWMHints/XSetWMHints.m
index 8cd7a76a..8cd7a76a 100644
--- a/xts5/tset/Xlib15/XSetWMHints/XSetWMHints.m
+++ b/xts5/Xlib15/XSetWMHints/XSetWMHints.m
diff --git a/xts5/tset/Xlib15/XSetWMIconName/XSetWMIconName.m b/xts5/Xlib15/XSetWMIconName/XSetWMIconName.m
index 4399bbf9..4399bbf9 100644
--- a/xts5/tset/Xlib15/XSetWMIconName/XSetWMIconName.m
+++ b/xts5/Xlib15/XSetWMIconName/XSetWMIconName.m
diff --git a/xts5/tset/Xlib15/XSetWMName/XSetWMName.m b/xts5/Xlib15/XSetWMName/XSetWMName.m
index cf92e84c..cf92e84c 100644
--- a/xts5/tset/Xlib15/XSetWMName/XSetWMName.m
+++ b/xts5/Xlib15/XSetWMName/XSetWMName.m
diff --git a/xts5/tset/Xlib15/XSetWMNormalHints/XSetWMNormalHints.m b/xts5/Xlib15/XSetWMNormalHints/XSetWMNormalHints.m
index 2087f2cb..2087f2cb 100644
--- a/xts5/tset/Xlib15/XSetWMNormalHints/XSetWMNormalHints.m
+++ b/xts5/Xlib15/XSetWMNormalHints/XSetWMNormalHints.m
diff --git a/xts5/tset/Xlib15/XSetWMProperties/Test1.c b/xts5/Xlib15/XSetWMProperties/Test1.c
index 305a846e..305a846e 100644
--- a/xts5/tset/Xlib15/XSetWMProperties/Test1.c
+++ b/xts5/Xlib15/XSetWMProperties/Test1.c
diff --git a/xts5/tset/Xlib15/XSetWMProperties/Test2.c b/xts5/Xlib15/XSetWMProperties/Test2.c
index e1aaf7f3..e1aaf7f3 100644
--- a/xts5/tset/Xlib15/XSetWMProperties/Test2.c
+++ b/xts5/Xlib15/XSetWMProperties/Test2.c
diff --git a/xts5/tset/Xlib15/XSetWMProperties/XSetWMProperties.m b/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m
index cebe0b99..cebe0b99 100644
--- a/xts5/tset/Xlib15/XSetWMProperties/XSetWMProperties.m
+++ b/xts5/Xlib15/XSetWMProperties/XSetWMProperties.m
diff --git a/xts5/tset/Xlib15/XSetWMProtocols/XSetWMProtocols.m b/xts5/Xlib15/XSetWMProtocols/XSetWMProtocols.m
index 18bd91f4..18bd91f4 100644
--- a/xts5/tset/Xlib15/XSetWMProtocols/XSetWMProtocols.m
+++ b/xts5/Xlib15/XSetWMProtocols/XSetWMProtocols.m
diff --git a/xts5/tset/Xlib15/XSetWMSizeHints/XSetWMSizeHints.m b/xts5/Xlib15/XSetWMSizeHints/XSetWMSizeHints.m
index 4237f8a9..4237f8a9 100644
--- a/xts5/tset/Xlib15/XSetWMSizeHints/XSetWMSizeHints.m
+++ b/xts5/Xlib15/XSetWMSizeHints/XSetWMSizeHints.m
diff --git a/xts5/tset/Xlib15/XStoreName/XStoreName.m b/xts5/Xlib15/XStoreName/XStoreName.m
index f4d1f1c1..f4d1f1c1 100644
--- a/xts5/tset/Xlib15/XStoreName/XStoreName.m
+++ b/xts5/Xlib15/XStoreName/XStoreName.m
diff --git a/xts5/tset/Xlib15/XStringListToTextProperty/XStringListToTextProperty.m b/xts5/Xlib15/XStringListToTextProperty/XStringListToTextProperty.m
index 23677ca9..23677ca9 100644
--- a/xts5/tset/Xlib15/XStringListToTextProperty/XStringListToTextProperty.m
+++ b/xts5/Xlib15/XStringListToTextProperty/XStringListToTextProperty.m
diff --git a/xts5/tset/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList.m b/xts5/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList.m
index c5d679f9..c5d679f9 100644
--- a/xts5/tset/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList.m
+++ b/xts5/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList.m
diff --git a/xts5/tset/Xlib15/XWithdrawWindow/XWithdrawWindow.m b/xts5/Xlib15/XWithdrawWindow/XWithdrawWindow.m
index 36d6d870..36d6d870 100644
--- a/xts5/tset/Xlib15/XWithdrawWindow/XWithdrawWindow.m
+++ b/xts5/Xlib15/XWithdrawWindow/XWithdrawWindow.m
diff --git a/xts5/tset/Xlib16/.gitignore b/xts5/Xlib16/.gitignore
index 5751da3e..5751da3e 100644
--- a/xts5/tset/Xlib16/.gitignore
+++ b/xts5/Xlib16/.gitignore
diff --git a/xts5/tset/Xlib16/Makefile.am b/xts5/Xlib16/Makefile.am
index 040c2863..040c2863 100644
--- a/xts5/tset/Xlib16/Makefile.am
+++ b/xts5/Xlib16/Makefile.am
diff --git a/xts5/tset/Xlib16/XResourceManagerString/XResourceManagerString.m b/xts5/Xlib16/XResourceManagerString/XResourceManagerString.m
index 6c21e4b2..6c21e4b2 100644
--- a/xts5/tset/Xlib16/XResourceManagerString/XResourceManagerString.m
+++ b/xts5/Xlib16/XResourceManagerString/XResourceManagerString.m
diff --git a/xts5/tset/Xlib16/XScreenResourceString/XScreenResourceString.m b/xts5/Xlib16/XScreenResourceString/XScreenResourceString.m
index 1b045b9c..1b045b9c 100644
--- a/xts5/tset/Xlib16/XScreenResourceString/XScreenResourceString.m
+++ b/xts5/Xlib16/XScreenResourceString/XScreenResourceString.m
diff --git a/xts5/tset/Xlib16/XrmCombineDatabase/XrmCombineDatabase.m b/xts5/Xlib16/XrmCombineDatabase/XrmCombineDatabase.m
index ac19f185..ac19f185 100644
--- a/xts5/tset/Xlib16/XrmCombineDatabase/XrmCombineDatabase.m
+++ b/xts5/Xlib16/XrmCombineDatabase/XrmCombineDatabase.m
diff --git a/xts5/tset/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase.m b/xts5/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase.m
index 365711a6..365711a6 100644
--- a/xts5/tset/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase.m
+++ b/xts5/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase.m
diff --git a/xts5/tset/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase.m b/xts5/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase.m
index 5833cd0f..5833cd0f 100644
--- a/xts5/tset/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase.m
+++ b/xts5/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase.m
diff --git a/xts5/tset/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase.m b/xts5/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase.m
index 0625b4f7..0625b4f7 100644
--- a/xts5/tset/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase.m
+++ b/xts5/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase.m
diff --git a/xts5/tset/Xlib16/XrmGetDatabase/XrmGetDatabase.m b/xts5/Xlib16/XrmGetDatabase/XrmGetDatabase.m
index 1ea232df..1ea232df 100644
--- a/xts5/tset/Xlib16/XrmGetDatabase/XrmGetDatabase.m
+++ b/xts5/Xlib16/XrmGetDatabase/XrmGetDatabase.m
diff --git a/xts5/tset/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase.m b/xts5/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase.m
index ec3a9f04..ec3a9f04 100644
--- a/xts5/tset/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase.m
+++ b/xts5/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase.m
diff --git a/xts5/tset/Xlib16/XrmGetResource/XrmGetResource.m b/xts5/Xlib16/XrmGetResource/XrmGetResource.m
index f875169d..f875169d 100644
--- a/xts5/tset/Xlib16/XrmGetResource/XrmGetResource.m
+++ b/xts5/Xlib16/XrmGetResource/XrmGetResource.m
diff --git a/xts5/tset/Xlib16/XrmGetResource/common.mc b/xts5/Xlib16/XrmGetResource/common.mc
index 7dc5527d..7dc5527d 100644
--- a/xts5/tset/Xlib16/XrmGetResource/common.mc
+++ b/xts5/Xlib16/XrmGetResource/common.mc
diff --git a/xts5/tset/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase.m b/xts5/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase.m
index 6232412a..6232412a 100644
--- a/xts5/tset/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase.m
+++ b/xts5/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase.m
diff --git a/xts5/tset/Xlib16/XrmInitialize/XrmInitialize.m b/xts5/Xlib16/XrmInitialize/XrmInitialize.m
index 9e7acaee..9e7acaee 100644
--- a/xts5/tset/Xlib16/XrmInitialize/XrmInitialize.m
+++ b/xts5/Xlib16/XrmInitialize/XrmInitialize.m
diff --git a/xts5/tset/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase.m b/xts5/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase.m
index 93385020..93385020 100644
--- a/xts5/tset/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase.m
+++ b/xts5/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase.m
diff --git a/xts5/tset/Xlib16/XrmMergeDatabases/XrmMergeDatabases.m b/xts5/Xlib16/XrmMergeDatabases/XrmMergeDatabases.m
index 7201ca50..7201ca50 100644
--- a/xts5/tset/Xlib16/XrmMergeDatabases/XrmMergeDatabases.m
+++ b/xts5/Xlib16/XrmMergeDatabases/XrmMergeDatabases.m
diff --git a/xts5/tset/Xlib16/XrmParseCommand/XrmParseCommand.m b/xts5/Xlib16/XrmParseCommand/XrmParseCommand.m
index 4aa4f060..4aa4f060 100644
--- a/xts5/tset/Xlib16/XrmParseCommand/XrmParseCommand.m
+++ b/xts5/Xlib16/XrmParseCommand/XrmParseCommand.m
diff --git a/xts5/tset/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark.m b/xts5/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark.m
index 7d4108fc..7d4108fc 100644
--- a/xts5/tset/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark.m
+++ b/xts5/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark.m
diff --git a/xts5/tset/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase.m b/xts5/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase.m
index 1d86711c..1d86711c 100644
--- a/xts5/tset/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase.m
+++ b/xts5/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase.m
diff --git a/xts5/tset/Xlib16/XrmPutLineResource/XrmPutLineResource.m b/xts5/Xlib16/XrmPutLineResource/XrmPutLineResource.m
index e6d34488..e6d34488 100644
--- a/xts5/tset/Xlib16/XrmPutLineResource/XrmPutLineResource.m
+++ b/xts5/Xlib16/XrmPutLineResource/XrmPutLineResource.m
diff --git a/xts5/tset/Xlib16/XrmPutResource/XrmPutResource.m b/xts5/Xlib16/XrmPutResource/XrmPutResource.m
index da06bd62..da06bd62 100644
--- a/xts5/tset/Xlib16/XrmPutResource/XrmPutResource.m
+++ b/xts5/Xlib16/XrmPutResource/XrmPutResource.m
diff --git a/xts5/tset/Xlib16/XrmPutResource/common.mc b/xts5/Xlib16/XrmPutResource/common.mc
index 99603d3f..99603d3f 100644
--- a/xts5/tset/Xlib16/XrmPutResource/common.mc
+++ b/xts5/Xlib16/XrmPutResource/common.mc
diff --git a/xts5/tset/Xlib16/XrmPutResource/fn.mc b/xts5/Xlib16/XrmPutResource/fn.mc
index 281dde6b..281dde6b 100644
--- a/xts5/tset/Xlib16/XrmPutResource/fn.mc
+++ b/xts5/Xlib16/XrmPutResource/fn.mc
diff --git a/xts5/tset/Xlib16/XrmPutStringResource/XrmPutStringResource.m b/xts5/Xlib16/XrmPutStringResource/XrmPutStringResource.m
index a4674531..a4674531 100644
--- a/xts5/tset/Xlib16/XrmPutStringResource/XrmPutStringResource.m
+++ b/xts5/Xlib16/XrmPutStringResource/XrmPutStringResource.m
diff --git a/xts5/tset/Xlib16/XrmQGetResource/XrmQGetResource.m b/xts5/Xlib16/XrmQGetResource/XrmQGetResource.m
index 0d45a182..0d45a182 100644
--- a/xts5/tset/Xlib16/XrmQGetResource/XrmQGetResource.m
+++ b/xts5/Xlib16/XrmQGetResource/XrmQGetResource.m
diff --git a/xts5/tset/Xlib16/XrmQGetSearchList/XrmQGetSearchList.m b/xts5/Xlib16/XrmQGetSearchList/XrmQGetSearchList.m
index 3578f511..3578f511 100644
--- a/xts5/tset/Xlib16/XrmQGetSearchList/XrmQGetSearchList.m
+++ b/xts5/Xlib16/XrmQGetSearchList/XrmQGetSearchList.m
diff --git a/xts5/tset/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource.m b/xts5/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource.m
index 3bf6698c..3bf6698c 100644
--- a/xts5/tset/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource.m
+++ b/xts5/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource.m
diff --git a/xts5/tset/Xlib16/XrmQPutResource/XrmQPutResource.m b/xts5/Xlib16/XrmQPutResource/XrmQPutResource.m
index 2cd78217..2cd78217 100644
--- a/xts5/tset/Xlib16/XrmQPutResource/XrmQPutResource.m
+++ b/xts5/Xlib16/XrmQPutResource/XrmQPutResource.m
diff --git a/xts5/tset/Xlib16/XrmQPutStringResource/XrmQPutStringResource.m b/xts5/Xlib16/XrmQPutStringResource/XrmQPutStringResource.m
index 67e1473d..67e1473d 100644
--- a/xts5/tset/Xlib16/XrmQPutStringResource/XrmQPutStringResource.m
+++ b/xts5/Xlib16/XrmQPutStringResource/XrmQPutStringResource.m
diff --git a/xts5/tset/Xlib16/XrmQuarkToString/XrmQuarkToString.m b/xts5/Xlib16/XrmQuarkToString/XrmQuarkToString.m
index c418ef0c..c418ef0c 100644
--- a/xts5/tset/Xlib16/XrmQuarkToString/XrmQuarkToString.m
+++ b/xts5/Xlib16/XrmQuarkToString/XrmQuarkToString.m
diff --git a/xts5/tset/Xlib16/XrmSetDatabase/XrmSetDatabase.m b/xts5/Xlib16/XrmSetDatabase/XrmSetDatabase.m
index 59fb5c55..59fb5c55 100644
--- a/xts5/tset/Xlib16/XrmSetDatabase/XrmSetDatabase.m
+++ b/xts5/Xlib16/XrmSetDatabase/XrmSetDatabase.m
diff --git a/xts5/tset/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList.m b/xts5/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList.m
index 861c08c3..861c08c3 100644
--- a/xts5/tset/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList.m
+++ b/xts5/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList.m
diff --git a/xts5/tset/Xlib16/XrmStringToQuark/XrmStringToQuark.m b/xts5/Xlib16/XrmStringToQuark/XrmStringToQuark.m
index 2614ac02..2614ac02 100644
--- a/xts5/tset/Xlib16/XrmStringToQuark/XrmStringToQuark.m
+++ b/xts5/Xlib16/XrmStringToQuark/XrmStringToQuark.m
diff --git a/xts5/tset/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList.m b/xts5/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList.m
index 2537136c..2537136c 100644
--- a/xts5/tset/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList.m
+++ b/xts5/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList.m
diff --git a/xts5/tset/Xlib16/XrmUniqueQuark/XrmUniqueQuark.m b/xts5/Xlib16/XrmUniqueQuark/XrmUniqueQuark.m
index 6d9f9911..6d9f9911 100644
--- a/xts5/tset/Xlib16/XrmUniqueQuark/XrmUniqueQuark.m
+++ b/xts5/Xlib16/XrmUniqueQuark/XrmUniqueQuark.m
diff --git a/xts5/tset/Xlib17/.gitignore b/xts5/Xlib17/.gitignore
index 95e9b17f..95e9b17f 100644
--- a/xts5/tset/Xlib17/.gitignore
+++ b/xts5/Xlib17/.gitignore
diff --git a/xts5/tset/Xlib17/IsCursorKey/IsCursorKey.m b/xts5/Xlib17/IsCursorKey/IsCursorKey.m
index 6bce260f..6bce260f 100644
--- a/xts5/tset/Xlib17/IsCursorKey/IsCursorKey.m
+++ b/xts5/Xlib17/IsCursorKey/IsCursorKey.m
diff --git a/xts5/tset/Xlib17/IsFunctionKey/IsFunctionKey.m b/xts5/Xlib17/IsFunctionKey/IsFunctionKey.m
index e9c146b6..e9c146b6 100644
--- a/xts5/tset/Xlib17/IsFunctionKey/IsFunctionKey.m
+++ b/xts5/Xlib17/IsFunctionKey/IsFunctionKey.m
diff --git a/xts5/tset/Xlib17/IsKeypadKey/IsKeypadKey.m b/xts5/Xlib17/IsKeypadKey/IsKeypadKey.m
index 9a467d53..9a467d53 100644
--- a/xts5/tset/Xlib17/IsKeypadKey/IsKeypadKey.m
+++ b/xts5/Xlib17/IsKeypadKey/IsKeypadKey.m
diff --git a/xts5/tset/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m b/xts5/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m
index 9f7c2525..9f7c2525 100644
--- a/xts5/tset/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m
+++ b/xts5/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey.m
diff --git a/xts5/tset/Xlib17/IsModifierKey/IsModifierKey.m b/xts5/Xlib17/IsModifierKey/IsModifierKey.m
index 68feccdd..68feccdd 100644
--- a/xts5/tset/Xlib17/IsModifierKey/IsModifierKey.m
+++ b/xts5/Xlib17/IsModifierKey/IsModifierKey.m
diff --git a/xts5/tset/Xlib17/IsPFKey/IsPFKey.m b/xts5/Xlib17/IsPFKey/IsPFKey.m
index 27d5e57a..27d5e57a 100644
--- a/xts5/tset/Xlib17/IsPFKey/IsPFKey.m
+++ b/xts5/Xlib17/IsPFKey/IsPFKey.m
diff --git a/xts5/tset/Xlib17/Makefile.am b/xts5/Xlib17/Makefile.am
index fd0531cb..fd0531cb 100644
--- a/xts5/tset/Xlib17/Makefile.am
+++ b/xts5/Xlib17/Makefile.am
diff --git a/xts5/tset/Xlib17/XAddPixel/XAddPixel.m b/xts5/Xlib17/XAddPixel/XAddPixel.m
index 4e7f7e9a..4e7f7e9a 100644
--- a/xts5/tset/Xlib17/XAddPixel/XAddPixel.m
+++ b/xts5/Xlib17/XAddPixel/XAddPixel.m
diff --git a/xts5/tset/Xlib17/XClipBox/XClipBox.m b/xts5/Xlib17/XClipBox/XClipBox.m
index 68c0cefb..68c0cefb 100644
--- a/xts5/tset/Xlib17/XClipBox/XClipBox.m
+++ b/xts5/Xlib17/XClipBox/XClipBox.m
diff --git a/xts5/tset/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m b/xts5/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m
index 526a6fc7..526a6fc7 100644
--- a/xts5/tset/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m
+++ b/xts5/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData.m
diff --git a/xts5/tset/Xlib17/XCreateImage/XCreateImage.m b/xts5/Xlib17/XCreateImage/XCreateImage.m
index 5d7385e9..5d7385e9 100644
--- a/xts5/tset/Xlib17/XCreateImage/XCreateImage.m
+++ b/xts5/Xlib17/XCreateImage/XCreateImage.m
diff --git a/xts5/tset/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m b/xts5/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m
index e64a4de1..e64a4de1 100644
--- a/xts5/tset/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m
+++ b/xts5/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData.m
diff --git a/xts5/tset/Xlib17/XCreateRegion/XCreateRegion.m b/xts5/Xlib17/XCreateRegion/XCreateRegion.m
index 96e44839..96e44839 100644
--- a/xts5/tset/Xlib17/XCreateRegion/XCreateRegion.m
+++ b/xts5/Xlib17/XCreateRegion/XCreateRegion.m
diff --git a/xts5/tset/Xlib17/XDeleteContext/XDeleteContext.m b/xts5/Xlib17/XDeleteContext/XDeleteContext.m
index 8cb51aa1..8cb51aa1 100644
--- a/xts5/tset/Xlib17/XDeleteContext/XDeleteContext.m
+++ b/xts5/Xlib17/XDeleteContext/XDeleteContext.m
diff --git a/xts5/tset/Xlib17/XDestroyImage/XDestroyImage.m b/xts5/Xlib17/XDestroyImage/XDestroyImage.m
index 68a0386c..68a0386c 100644
--- a/xts5/tset/Xlib17/XDestroyImage/XDestroyImage.m
+++ b/xts5/Xlib17/XDestroyImage/XDestroyImage.m
diff --git a/xts5/tset/Xlib17/XDestroyRegion/XDestroyRegion.m b/xts5/Xlib17/XDestroyRegion/XDestroyRegion.m
index 1591f5de..1591f5de 100644
--- a/xts5/tset/Xlib17/XDestroyRegion/XDestroyRegion.m
+++ b/xts5/Xlib17/XDestroyRegion/XDestroyRegion.m
diff --git a/xts5/tset/Xlib17/XEmptyRegion/XEmptyRegion.m b/xts5/Xlib17/XEmptyRegion/XEmptyRegion.m
index d892fdec..d892fdec 100644
--- a/xts5/tset/Xlib17/XEmptyRegion/XEmptyRegion.m
+++ b/xts5/Xlib17/XEmptyRegion/XEmptyRegion.m
diff --git a/xts5/tset/Xlib17/XEqualRegion/XEqualRegion.m b/xts5/Xlib17/XEqualRegion/XEqualRegion.m
index de18cfe0..de18cfe0 100644
--- a/xts5/tset/Xlib17/XEqualRegion/XEqualRegion.m
+++ b/xts5/Xlib17/XEqualRegion/XEqualRegion.m
diff --git a/xts5/tset/Xlib17/XFetchBuffer/XFetchBuffer.m b/xts5/Xlib17/XFetchBuffer/XFetchBuffer.m
index c0c0402f..c0c0402f 100644
--- a/xts5/tset/Xlib17/XFetchBuffer/XFetchBuffer.m
+++ b/xts5/Xlib17/XFetchBuffer/XFetchBuffer.m
diff --git a/xts5/tset/Xlib17/XFetchBytes/XFetchBytes.m b/xts5/Xlib17/XFetchBytes/XFetchBytes.m
index 8ca133d1..8ca133d1 100644
--- a/xts5/tset/Xlib17/XFetchBytes/XFetchBytes.m
+++ b/xts5/Xlib17/XFetchBytes/XFetchBytes.m
diff --git a/xts5/tset/Xlib17/XFindContext/XFindContext.m b/xts5/Xlib17/XFindContext/XFindContext.m
index da8cde8c..da8cde8c 100644
--- a/xts5/tset/Xlib17/XFindContext/XFindContext.m
+++ b/xts5/Xlib17/XFindContext/XFindContext.m
diff --git a/xts5/tset/Xlib17/XGetDefault/EnvXdefaults b/xts5/Xlib17/XGetDefault/EnvXdefaults
index 01660afc..01660afc 100644
--- a/xts5/tset/Xlib17/XGetDefault/EnvXdefaults
+++ b/xts5/Xlib17/XGetDefault/EnvXdefaults
diff --git a/xts5/tset/Xlib17/XGetDefault/HstXdefaults b/xts5/Xlib17/XGetDefault/HstXdefaults
index e866348c..e866348c 100644
--- a/xts5/tset/Xlib17/XGetDefault/HstXdefaults
+++ b/xts5/Xlib17/XGetDefault/HstXdefaults
diff --git a/xts5/tset/Xlib17/XGetDefault/Test3.c b/xts5/Xlib17/XGetDefault/Test3.c
index bc36a17f..bc36a17f 100644
--- a/xts5/tset/Xlib17/XGetDefault/Test3.c
+++ b/xts5/Xlib17/XGetDefault/Test3.c
diff --git a/xts5/tset/Xlib17/XGetDefault/Test4.c b/xts5/Xlib17/XGetDefault/Test4.c
index 2d95d2e4..2d95d2e4 100644
--- a/xts5/tset/Xlib17/XGetDefault/Test4.c
+++ b/xts5/Xlib17/XGetDefault/Test4.c
diff --git a/xts5/tset/Xlib17/XGetDefault/Test5.c b/xts5/Xlib17/XGetDefault/Test5.c
index 7344326a..7344326a 100644
--- a/xts5/tset/Xlib17/XGetDefault/Test5.c
+++ b/xts5/Xlib17/XGetDefault/Test5.c
diff --git a/xts5/tset/Xlib17/XGetDefault/XGetDefault.m b/xts5/Xlib17/XGetDefault/XGetDefault.m
index 440d1a93..440d1a93 100644
--- a/xts5/tset/Xlib17/XGetDefault/XGetDefault.m
+++ b/xts5/Xlib17/XGetDefault/XGetDefault.m
diff --git a/xts5/tset/Xlib17/XGetDefault/Xdefaults b/xts5/Xlib17/XGetDefault/Xdefaults
index 589b0ee5..589b0ee5 100644
--- a/xts5/tset/Xlib17/XGetDefault/Xdefaults
+++ b/xts5/Xlib17/XGetDefault/Xdefaults
diff --git a/xts5/tset/Xlib17/XGetPixel/XGetPixel.m b/xts5/Xlib17/XGetPixel/XGetPixel.m
index b50240d4..b50240d4 100644
--- a/xts5/tset/Xlib17/XGetPixel/XGetPixel.m
+++ b/xts5/Xlib17/XGetPixel/XGetPixel.m
diff --git a/xts5/tset/Xlib17/XGetVisualInfo/XGetVisualInfo.m b/xts5/Xlib17/XGetVisualInfo/XGetVisualInfo.m
index f7a25d7e..f7a25d7e 100644
--- a/xts5/tset/Xlib17/XGetVisualInfo/XGetVisualInfo.m
+++ b/xts5/Xlib17/XGetVisualInfo/XGetVisualInfo.m
diff --git a/xts5/tset/Xlib17/XIntersectRegion/XIntersectRegion.m b/xts5/Xlib17/XIntersectRegion/XIntersectRegion.m
index f7560c57..f7560c57 100644
--- a/xts5/tset/Xlib17/XIntersectRegion/XIntersectRegion.m
+++ b/xts5/Xlib17/XIntersectRegion/XIntersectRegion.m
diff --git a/xts5/tset/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m b/xts5/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m
index ed0b67ec..ed0b67ec 100644
--- a/xts5/tset/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m
+++ b/xts5/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym.m
diff --git a/xts5/tset/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m b/xts5/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m
index bc62a0e8..bc62a0e8 100644
--- a/xts5/tset/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m
+++ b/xts5/Xlib17/XKeysymToKeycode/XKeysymToKeycode.m
diff --git a/xts5/tset/Xlib17/XKeysymToString/XKeysymToString.m b/xts5/Xlib17/XKeysymToString/XKeysymToString.m
index 36907962..36907962 100644
--- a/xts5/tset/Xlib17/XKeysymToString/XKeysymToString.m
+++ b/xts5/Xlib17/XKeysymToString/XKeysymToString.m
diff --git a/xts5/tset/Xlib17/XLookupKeysym/XLookupKeysym.m b/xts5/Xlib17/XLookupKeysym/XLookupKeysym.m
index d840c313..d840c313 100644
--- a/xts5/tset/Xlib17/XLookupKeysym/XLookupKeysym.m
+++ b/xts5/Xlib17/XLookupKeysym/XLookupKeysym.m
diff --git a/xts5/tset/Xlib17/XLookupString/XLookupString.m b/xts5/Xlib17/XLookupString/XLookupString.m
index 1d44cf12..1d44cf12 100644
--- a/xts5/tset/Xlib17/XLookupString/XLookupString.m
+++ b/xts5/Xlib17/XLookupString/XLookupString.m
diff --git a/xts5/tset/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m b/xts5/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m
index 790e4420..790e4420 100644
--- a/xts5/tset/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m
+++ b/xts5/Xlib17/XMatchVisualInfo/XMatchVisualInfo.m
diff --git a/xts5/tset/Xlib17/XOffsetRegion/XOffsetRegion.m b/xts5/Xlib17/XOffsetRegion/XOffsetRegion.m
index 07b1994b..07b1994b 100644
--- a/xts5/tset/Xlib17/XOffsetRegion/XOffsetRegion.m
+++ b/xts5/Xlib17/XOffsetRegion/XOffsetRegion.m
diff --git a/xts5/tset/Xlib17/XParseGeometry/XParseGeometry.m b/xts5/Xlib17/XParseGeometry/XParseGeometry.m
index cf97b5a3..cf97b5a3 100644
--- a/xts5/tset/Xlib17/XParseGeometry/XParseGeometry.m
+++ b/xts5/Xlib17/XParseGeometry/XParseGeometry.m
diff --git a/xts5/tset/Xlib17/XPointInRegion/XPointInRegion.m b/xts5/Xlib17/XPointInRegion/XPointInRegion.m
index b3892ed8..b3892ed8 100644
--- a/xts5/tset/Xlib17/XPointInRegion/XPointInRegion.m
+++ b/xts5/Xlib17/XPointInRegion/XPointInRegion.m
diff --git a/xts5/tset/Xlib17/XPolygonRegion/XPolygonRegion.m b/xts5/Xlib17/XPolygonRegion/XPolygonRegion.m
index c6e3f0c2..c6e3f0c2 100644
--- a/xts5/tset/Xlib17/XPolygonRegion/XPolygonRegion.m
+++ b/xts5/Xlib17/XPolygonRegion/XPolygonRegion.m
diff --git a/xts5/tset/Xlib17/XPutPixel/XPutPixel.m b/xts5/Xlib17/XPutPixel/XPutPixel.m
index 2712d6aa..2712d6aa 100644
--- a/xts5/tset/Xlib17/XPutPixel/XPutPixel.m
+++ b/xts5/Xlib17/XPutPixel/XPutPixel.m
diff --git a/xts5/tset/Xlib17/XReadBitmapFile/XReadBitmapFile.m b/xts5/Xlib17/XReadBitmapFile/XReadBitmapFile.m
index 6e5af903..6e5af903 100644
--- a/xts5/tset/Xlib17/XReadBitmapFile/XReadBitmapFile.m
+++ b/xts5/Xlib17/XReadBitmapFile/XReadBitmapFile.m
diff --git a/xts5/tset/Xlib17/XRebindKeysym/XRebindKeysym.m b/xts5/Xlib17/XRebindKeysym/XRebindKeysym.m
index 9ec994ff..9ec994ff 100644
--- a/xts5/tset/Xlib17/XRebindKeysym/XRebindKeysym.m
+++ b/xts5/Xlib17/XRebindKeysym/XRebindKeysym.m
diff --git a/xts5/tset/Xlib17/XRectInRegion/XRectInRegion.m b/xts5/Xlib17/XRectInRegion/XRectInRegion.m
index ea09f22c..ea09f22c 100644
--- a/xts5/tset/Xlib17/XRectInRegion/XRectInRegion.m
+++ b/xts5/Xlib17/XRectInRegion/XRectInRegion.m
diff --git a/xts5/tset/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m b/xts5/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m
index bb6641aa..bb6641aa 100644
--- a/xts5/tset/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m
+++ b/xts5/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping.m
diff --git a/xts5/tset/Xlib17/XRotateBuffers/XRotateBuffers.m b/xts5/Xlib17/XRotateBuffers/XRotateBuffers.m
index 32a7a5bf..32a7a5bf 100644
--- a/xts5/tset/Xlib17/XRotateBuffers/XRotateBuffers.m
+++ b/xts5/Xlib17/XRotateBuffers/XRotateBuffers.m
diff --git a/xts5/tset/Xlib17/XSaveContext/XSaveContext.m b/xts5/Xlib17/XSaveContext/XSaveContext.m
index cc377371..cc377371 100644
--- a/xts5/tset/Xlib17/XSaveContext/XSaveContext.m
+++ b/xts5/Xlib17/XSaveContext/XSaveContext.m
diff --git a/xts5/tset/Xlib17/XSetRegion/XSetRegion.m b/xts5/Xlib17/XSetRegion/XSetRegion.m
index 625d4fac..625d4fac 100644
--- a/xts5/tset/Xlib17/XSetRegion/XSetRegion.m
+++ b/xts5/Xlib17/XSetRegion/XSetRegion.m
diff --git a/xts5/tset/Xlib17/XShrinkRegion/XShrinkRegion.m b/xts5/Xlib17/XShrinkRegion/XShrinkRegion.m
index 35f078e5..35f078e5 100644
--- a/xts5/tset/Xlib17/XShrinkRegion/XShrinkRegion.m
+++ b/xts5/Xlib17/XShrinkRegion/XShrinkRegion.m
diff --git a/xts5/tset/Xlib17/XStoreBuffer/XStoreBuffer.m b/xts5/Xlib17/XStoreBuffer/XStoreBuffer.m
index b46472bc..b46472bc 100644
--- a/xts5/tset/Xlib17/XStoreBuffer/XStoreBuffer.m
+++ b/xts5/Xlib17/XStoreBuffer/XStoreBuffer.m
diff --git a/xts5/tset/Xlib17/XStoreBytes/XStoreBytes.m b/xts5/Xlib17/XStoreBytes/XStoreBytes.m
index bb054d99..bb054d99 100644
--- a/xts5/tset/Xlib17/XStoreBytes/XStoreBytes.m
+++ b/xts5/Xlib17/XStoreBytes/XStoreBytes.m
diff --git a/xts5/tset/Xlib17/XStringToKeysym/XStringToKeysym.m b/xts5/Xlib17/XStringToKeysym/XStringToKeysym.m
index f408ff3f..f408ff3f 100644
--- a/xts5/tset/Xlib17/XStringToKeysym/XStringToKeysym.m
+++ b/xts5/Xlib17/XStringToKeysym/XStringToKeysym.m
diff --git a/xts5/tset/Xlib17/XSubImage/XSubImage.m b/xts5/Xlib17/XSubImage/XSubImage.m
index e4f2bb31..e4f2bb31 100644
--- a/xts5/tset/Xlib17/XSubImage/XSubImage.m
+++ b/xts5/Xlib17/XSubImage/XSubImage.m
diff --git a/xts5/tset/Xlib17/XSubtractRegion/XSubtractRegion.m b/xts5/Xlib17/XSubtractRegion/XSubtractRegion.m
index cfc87fe8..cfc87fe8 100644
--- a/xts5/tset/Xlib17/XSubtractRegion/XSubtractRegion.m
+++ b/xts5/Xlib17/XSubtractRegion/XSubtractRegion.m
diff --git a/xts5/tset/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m b/xts5/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m
index c6aadfe9..c6aadfe9 100644
--- a/xts5/tset/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m
+++ b/xts5/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion.m
diff --git a/xts5/tset/Xlib17/XUnionRegion/XUnionRegion.m b/xts5/Xlib17/XUnionRegion/XUnionRegion.m
index 1dea301e..1dea301e 100644
--- a/xts5/tset/Xlib17/XUnionRegion/XUnionRegion.m
+++ b/xts5/Xlib17/XUnionRegion/XUnionRegion.m
diff --git a/xts5/tset/Xlib17/XUniqueContext/XUniqueContext.m b/xts5/Xlib17/XUniqueContext/XUniqueContext.m
index 3ec53beb..3ec53beb 100644
--- a/xts5/tset/Xlib17/XUniqueContext/XUniqueContext.m
+++ b/xts5/Xlib17/XUniqueContext/XUniqueContext.m
diff --git a/xts5/tset/Xlib17/XWMGeometry/XWMGeometry.m b/xts5/Xlib17/XWMGeometry/XWMGeometry.m
index ae9caeff..ae9caeff 100644
--- a/xts5/tset/Xlib17/XWMGeometry/XWMGeometry.m
+++ b/xts5/Xlib17/XWMGeometry/XWMGeometry.m
diff --git a/xts5/tset/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m b/xts5/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m
index de6c28dd..de6c28dd 100644
--- a/xts5/tset/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m
+++ b/xts5/Xlib17/XWriteBitmapFile/XWriteBitmapFile.m
diff --git a/xts5/tset/Xlib17/XXorRegion/XXorRegion.m b/xts5/Xlib17/XXorRegion/XXorRegion.m
index f5a63cb2..f5a63cb2 100644
--- a/xts5/tset/Xlib17/XXorRegion/XXorRegion.m
+++ b/xts5/Xlib17/XXorRegion/XXorRegion.m
diff --git a/xts5/tset/Xlib17/Xpermalloc/Xpermalloc.m b/xts5/Xlib17/Xpermalloc/Xpermalloc.m
index 259a23a8..259a23a8 100644
--- a/xts5/tset/Xlib17/Xpermalloc/Xpermalloc.m
+++ b/xts5/Xlib17/Xpermalloc/Xpermalloc.m
diff --git a/xts5/tset/Xlib3/.gitignore b/xts5/Xlib3/.gitignore
index bfc8978b..bfc8978b 100644
--- a/xts5/tset/Xlib3/.gitignore
+++ b/xts5/Xlib3/.gitignore
diff --git a/xts5/tset/Xlib3/Makefile.am b/xts5/Xlib3/Makefile.am
index c36cd73a..c36cd73a 100644
--- a/xts5/tset/Xlib3/Makefile.am
+++ b/xts5/Xlib3/Makefile.am
diff --git a/xts5/tset/Xlib3/XAllPlanes/XAllPlanes.m b/xts5/Xlib3/XAllPlanes/XAllPlanes.m
index 2f461bda..2f461bda 100644
--- a/xts5/tset/Xlib3/XAllPlanes/XAllPlanes.m
+++ b/xts5/Xlib3/XAllPlanes/XAllPlanes.m
diff --git a/xts5/tset/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m b/xts5/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m
index 3eefe172..3eefe172 100644
--- a/xts5/tset/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m
+++ b/xts5/Xlib3/XBitmapBitOrder/XBitmapBitOrder.m
diff --git a/xts5/tset/Xlib3/XBitmapPad/XBitmapPad.m b/xts5/Xlib3/XBitmapPad/XBitmapPad.m
index 6ae1911e..6ae1911e 100644
--- a/xts5/tset/Xlib3/XBitmapPad/XBitmapPad.m
+++ b/xts5/Xlib3/XBitmapPad/XBitmapPad.m
diff --git a/xts5/tset/Xlib3/XBitmapUnit/XBitmapUnit.m b/xts5/Xlib3/XBitmapUnit/XBitmapUnit.m
index f454c6b2..f454c6b2 100644
--- a/xts5/tset/Xlib3/XBitmapUnit/XBitmapUnit.m
+++ b/xts5/Xlib3/XBitmapUnit/XBitmapUnit.m
diff --git a/xts5/tset/Xlib3/XBlackPixel/XBlackPixel.m b/xts5/Xlib3/XBlackPixel/XBlackPixel.m
index 9b0fc781..9b0fc781 100644
--- a/xts5/tset/Xlib3/XBlackPixel/XBlackPixel.m
+++ b/xts5/Xlib3/XBlackPixel/XBlackPixel.m
diff --git a/xts5/tset/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m b/xts5/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m
index 578c9ef6..578c9ef6 100644
--- a/xts5/tset/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m
+++ b/xts5/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen.m
diff --git a/xts5/tset/Xlib3/XCellsOfScreen/XCellsOfScreen.m b/xts5/Xlib3/XCellsOfScreen/XCellsOfScreen.m
index 01b9bfea..01b9bfea 100644
--- a/xts5/tset/Xlib3/XCellsOfScreen/XCellsOfScreen.m
+++ b/xts5/Xlib3/XCellsOfScreen/XCellsOfScreen.m
diff --git a/xts5/tset/Xlib3/XCloseDisplay/XCloseDisplay.m b/xts5/Xlib3/XCloseDisplay/XCloseDisplay.m
index bfd06a3e..bfd06a3e 100644
--- a/xts5/tset/Xlib3/XCloseDisplay/XCloseDisplay.m
+++ b/xts5/Xlib3/XCloseDisplay/XCloseDisplay.m
diff --git a/xts5/tset/Xlib3/XConnectionNumber/XConnectionNumber.m b/xts5/Xlib3/XConnectionNumber/XConnectionNumber.m
index 0a5818bf..0a5818bf 100644
--- a/xts5/tset/Xlib3/XConnectionNumber/XConnectionNumber.m
+++ b/xts5/Xlib3/XConnectionNumber/XConnectionNumber.m
diff --git a/xts5/tset/Xlib3/XDefaultColormap/XDefaultColormap.m b/xts5/Xlib3/XDefaultColormap/XDefaultColormap.m
index 8a112740..8a112740 100644
--- a/xts5/tset/Xlib3/XDefaultColormap/XDefaultColormap.m
+++ b/xts5/Xlib3/XDefaultColormap/XDefaultColormap.m
diff --git a/xts5/tset/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m b/xts5/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m
index 90e84a99..90e84a99 100644
--- a/xts5/tset/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m
+++ b/xts5/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen.m
diff --git a/xts5/tset/Xlib3/XDefaultDepth/XDefaultDepth.m b/xts5/Xlib3/XDefaultDepth/XDefaultDepth.m
index f3e96e23..f3e96e23 100644
--- a/xts5/tset/Xlib3/XDefaultDepth/XDefaultDepth.m
+++ b/xts5/Xlib3/XDefaultDepth/XDefaultDepth.m
diff --git a/xts5/tset/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m b/xts5/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m
index 715575a1..715575a1 100644
--- a/xts5/tset/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m
+++ b/xts5/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen.m
diff --git a/xts5/tset/Xlib3/XDefaultGC/XDefaultGC.m b/xts5/Xlib3/XDefaultGC/XDefaultGC.m
index e6a851c8..e6a851c8 100644
--- a/xts5/tset/Xlib3/XDefaultGC/XDefaultGC.m
+++ b/xts5/Xlib3/XDefaultGC/XDefaultGC.m
diff --git a/xts5/tset/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m b/xts5/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m
index d9d98ca6..d9d98ca6 100644
--- a/xts5/tset/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m
+++ b/xts5/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen.m
diff --git a/xts5/tset/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m b/xts5/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m
index 769629b8..769629b8 100644
--- a/xts5/tset/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m
+++ b/xts5/Xlib3/XDefaultRootWindow/XDefaultRootWindow.m
diff --git a/xts5/tset/Xlib3/XDefaultScreen/XDefaultScreen.m b/xts5/Xlib3/XDefaultScreen/XDefaultScreen.m
index 3c73bb6a..3c73bb6a 100644
--- a/xts5/tset/Xlib3/XDefaultScreen/XDefaultScreen.m
+++ b/xts5/Xlib3/XDefaultScreen/XDefaultScreen.m
diff --git a/xts5/tset/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m b/xts5/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m
index a355e436..a355e436 100644
--- a/xts5/tset/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m
+++ b/xts5/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay.m
diff --git a/xts5/tset/Xlib3/XDefaultVisual/XDefaultVisual.m b/xts5/Xlib3/XDefaultVisual/XDefaultVisual.m
index c0363d33..c0363d33 100644
--- a/xts5/tset/Xlib3/XDefaultVisual/XDefaultVisual.m
+++ b/xts5/Xlib3/XDefaultVisual/XDefaultVisual.m
diff --git a/xts5/tset/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m b/xts5/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m
index 70c5f22a..70c5f22a 100644
--- a/xts5/tset/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m
+++ b/xts5/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen.m
diff --git a/xts5/tset/Xlib3/XDisplayCells/XDisplayCells.m b/xts5/Xlib3/XDisplayCells/XDisplayCells.m
index f683f5ad..f683f5ad 100644
--- a/xts5/tset/Xlib3/XDisplayCells/XDisplayCells.m
+++ b/xts5/Xlib3/XDisplayCells/XDisplayCells.m
diff --git a/xts5/tset/Xlib3/XDisplayHeight/XDisplayHeight.m b/xts5/Xlib3/XDisplayHeight/XDisplayHeight.m
index 686e5a01..686e5a01 100644
--- a/xts5/tset/Xlib3/XDisplayHeight/XDisplayHeight.m
+++ b/xts5/Xlib3/XDisplayHeight/XDisplayHeight.m
diff --git a/xts5/tset/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m b/xts5/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m
index 2e109aff..2e109aff 100644
--- a/xts5/tset/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m
+++ b/xts5/Xlib3/XDisplayHeightMM/XDisplayHeightMM.m
diff --git a/xts5/tset/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m b/xts5/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m
index 296947d4..296947d4 100644
--- a/xts5/tset/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m
+++ b/xts5/Xlib3/XDisplayOfScreen/XDisplayOfScreen.m
diff --git a/xts5/tset/Xlib3/XDisplayPlanes/XDisplayPlanes.m b/xts5/Xlib3/XDisplayPlanes/XDisplayPlanes.m
index ca6082d6..ca6082d6 100644
--- a/xts5/tset/Xlib3/XDisplayPlanes/XDisplayPlanes.m
+++ b/xts5/Xlib3/XDisplayPlanes/XDisplayPlanes.m
diff --git a/xts5/tset/Xlib3/XDisplayString/Test1.c b/xts5/Xlib3/XDisplayString/Test1.c
index 1c56dcb0..1c56dcb0 100644
--- a/xts5/tset/Xlib3/XDisplayString/Test1.c
+++ b/xts5/Xlib3/XDisplayString/Test1.c
diff --git a/xts5/tset/Xlib3/XDisplayString/XDisplayString.m b/xts5/Xlib3/XDisplayString/XDisplayString.m
index 5185e976..5185e976 100644
--- a/xts5/tset/Xlib3/XDisplayString/XDisplayString.m
+++ b/xts5/Xlib3/XDisplayString/XDisplayString.m
diff --git a/xts5/tset/Xlib3/XDisplayWidth/XDisplayWidth.m b/xts5/Xlib3/XDisplayWidth/XDisplayWidth.m
index 4315e2de..4315e2de 100644
--- a/xts5/tset/Xlib3/XDisplayWidth/XDisplayWidth.m
+++ b/xts5/Xlib3/XDisplayWidth/XDisplayWidth.m
diff --git a/xts5/tset/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m b/xts5/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m
index 6f938f29..6f938f29 100644
--- a/xts5/tset/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m
+++ b/xts5/Xlib3/XDisplayWidthMM/XDisplayWidthMM.m
diff --git a/xts5/tset/Xlib3/XDoesBackingStore/XDoesBackingStore.m b/xts5/Xlib3/XDoesBackingStore/XDoesBackingStore.m
index 8d95dc9b..8d95dc9b 100644
--- a/xts5/tset/Xlib3/XDoesBackingStore/XDoesBackingStore.m
+++ b/xts5/Xlib3/XDoesBackingStore/XDoesBackingStore.m
diff --git a/xts5/tset/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m b/xts5/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m
index 02bcfcfc..02bcfcfc 100644
--- a/xts5/tset/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m
+++ b/xts5/Xlib3/XDoesSaveUnders/XDoesSaveUnders.m
diff --git a/xts5/tset/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m b/xts5/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m
index 23ceb0aa..23ceb0aa 100644
--- a/xts5/tset/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m
+++ b/xts5/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen.m
diff --git a/xts5/tset/Xlib3/XFree/XFree.m b/xts5/Xlib3/XFree/XFree.m
index c49461f5..c49461f5 100644
--- a/xts5/tset/Xlib3/XFree/XFree.m
+++ b/xts5/Xlib3/XFree/XFree.m
diff --git a/xts5/tset/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m b/xts5/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m
index dc9063a4..dc9063a4 100644
--- a/xts5/tset/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m
+++ b/xts5/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen.m
diff --git a/xts5/tset/Xlib3/XHeightOfScreen/XHeightOfScreen.m b/xts5/Xlib3/XHeightOfScreen/XHeightOfScreen.m
index 495070c8..495070c8 100644
--- a/xts5/tset/Xlib3/XHeightOfScreen/XHeightOfScreen.m
+++ b/xts5/Xlib3/XHeightOfScreen/XHeightOfScreen.m
diff --git a/xts5/tset/Xlib3/XImageByteOrder/XImageByteOrder.m b/xts5/Xlib3/XImageByteOrder/XImageByteOrder.m
index 877c5f45..877c5f45 100644
--- a/xts5/tset/Xlib3/XImageByteOrder/XImageByteOrder.m
+++ b/xts5/Xlib3/XImageByteOrder/XImageByteOrder.m
diff --git a/xts5/tset/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m b/xts5/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m
index c740e51e..c740e51e 100644
--- a/xts5/tset/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m
+++ b/xts5/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed.m
diff --git a/xts5/tset/Xlib3/XListDepths/XListDepths.m b/xts5/Xlib3/XListDepths/XListDepths.m
index a159feef..a159feef 100644
--- a/xts5/tset/Xlib3/XListDepths/XListDepths.m
+++ b/xts5/Xlib3/XListDepths/XListDepths.m
diff --git a/xts5/tset/Xlib3/XListPixmapFormats/XListPixmapFormats.m b/xts5/Xlib3/XListPixmapFormats/XListPixmapFormats.m
index 99da3843..99da3843 100644
--- a/xts5/tset/Xlib3/XListPixmapFormats/XListPixmapFormats.m
+++ b/xts5/Xlib3/XListPixmapFormats/XListPixmapFormats.m
diff --git a/xts5/tset/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m b/xts5/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m
index b801542c..b801542c 100644
--- a/xts5/tset/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m
+++ b/xts5/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen.m
diff --git a/xts5/tset/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m b/xts5/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m
index 535fa8be..535fa8be 100644
--- a/xts5/tset/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m
+++ b/xts5/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen.m
diff --git a/xts5/tset/Xlib3/XNextRequest/XNextRequest.m b/xts5/Xlib3/XNextRequest/XNextRequest.m
index f1984c1a..f1984c1a 100644
--- a/xts5/tset/Xlib3/XNextRequest/XNextRequest.m
+++ b/xts5/Xlib3/XNextRequest/XNextRequest.m
diff --git a/xts5/tset/Xlib3/XNoOp/XNoOp.m b/xts5/Xlib3/XNoOp/XNoOp.m
index 68aaa233..68aaa233 100644
--- a/xts5/tset/Xlib3/XNoOp/XNoOp.m
+++ b/xts5/Xlib3/XNoOp/XNoOp.m
diff --git a/xts5/tset/Xlib3/XOpenDisplay/Test1.c b/xts5/Xlib3/XOpenDisplay/Test1.c
index 639981ad..639981ad 100644
--- a/xts5/tset/Xlib3/XOpenDisplay/Test1.c
+++ b/xts5/Xlib3/XOpenDisplay/Test1.c
diff --git a/xts5/tset/Xlib3/XOpenDisplay/XOpenDisplay.m b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m
index e0c54cfa..e0c54cfa 100644
--- a/xts5/tset/Xlib3/XOpenDisplay/XOpenDisplay.m
+++ b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m
diff --git a/xts5/tset/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m b/xts5/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m
index f44605a6..f44605a6 100644
--- a/xts5/tset/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m
+++ b/xts5/Xlib3/XPlanesOfScreen/XPlanesOfScreen.m
diff --git a/xts5/tset/Xlib3/XProtocolRevision/XProtocolRevision.m b/xts5/Xlib3/XProtocolRevision/XProtocolRevision.m
index f1434dd9..f1434dd9 100644
--- a/xts5/tset/Xlib3/XProtocolRevision/XProtocolRevision.m
+++ b/xts5/Xlib3/XProtocolRevision/XProtocolRevision.m
diff --git a/xts5/tset/Xlib3/XProtocolVersion/XProtocolVersion.m b/xts5/Xlib3/XProtocolVersion/XProtocolVersion.m
index b39b69d5..b39b69d5 100644
--- a/xts5/tset/Xlib3/XProtocolVersion/XProtocolVersion.m
+++ b/xts5/Xlib3/XProtocolVersion/XProtocolVersion.m
diff --git a/xts5/tset/Xlib3/XQLength/XQLength.m b/xts5/Xlib3/XQLength/XQLength.m
index 0edf4faa..0edf4faa 100644
--- a/xts5/tset/Xlib3/XQLength/XQLength.m
+++ b/xts5/Xlib3/XQLength/XQLength.m
diff --git a/xts5/tset/Xlib3/XRootWindow/XRootWindow.m b/xts5/Xlib3/XRootWindow/XRootWindow.m
index 9353a0cf..9353a0cf 100644
--- a/xts5/tset/Xlib3/XRootWindow/XRootWindow.m
+++ b/xts5/Xlib3/XRootWindow/XRootWindow.m
diff --git a/xts5/tset/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m b/xts5/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m
index 3acc1c2f..3acc1c2f 100644
--- a/xts5/tset/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m
+++ b/xts5/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen.m
diff --git a/xts5/tset/Xlib3/XScreenCount/XScreenCount.m b/xts5/Xlib3/XScreenCount/XScreenCount.m
index d9fe3208..d9fe3208 100644
--- a/xts5/tset/Xlib3/XScreenCount/XScreenCount.m
+++ b/xts5/Xlib3/XScreenCount/XScreenCount.m
diff --git a/xts5/tset/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m b/xts5/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m
index 7df7aec0..7df7aec0 100644
--- a/xts5/tset/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m
+++ b/xts5/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen.m
diff --git a/xts5/tset/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m b/xts5/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m
index 742894c7..742894c7 100644
--- a/xts5/tset/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m
+++ b/xts5/Xlib3/XScreenOfDisplay/XScreenOfDisplay.m
diff --git a/xts5/tset/Xlib3/XServerVendor/XServerVendor.m b/xts5/Xlib3/XServerVendor/XServerVendor.m
index d2c16ffc..d2c16ffc 100644
--- a/xts5/tset/Xlib3/XServerVendor/XServerVendor.m
+++ b/xts5/Xlib3/XServerVendor/XServerVendor.m
diff --git a/xts5/tset/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m b/xts5/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m
index 8188cab7..8188cab7 100644
--- a/xts5/tset/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m
+++ b/xts5/Xlib3/XSetCloseDownMode/XSetCloseDownMode.m
diff --git a/xts5/tset/Xlib3/XVendorRelease/XVendorRelease.m b/xts5/Xlib3/XVendorRelease/XVendorRelease.m
index 26287f95..26287f95 100644
--- a/xts5/tset/Xlib3/XVendorRelease/XVendorRelease.m
+++ b/xts5/Xlib3/XVendorRelease/XVendorRelease.m
diff --git a/xts5/tset/Xlib3/XWhitePixel/XWhitePixel.m b/xts5/Xlib3/XWhitePixel/XWhitePixel.m
index 23a516e5..23a516e5 100644
--- a/xts5/tset/Xlib3/XWhitePixel/XWhitePixel.m
+++ b/xts5/Xlib3/XWhitePixel/XWhitePixel.m
diff --git a/xts5/tset/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m b/xts5/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m
index a02518ac..a02518ac 100644
--- a/xts5/tset/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m
+++ b/xts5/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen.m
diff --git a/xts5/tset/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m b/xts5/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m
index bfb8953b..bfb8953b 100644
--- a/xts5/tset/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m
+++ b/xts5/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen.m
diff --git a/xts5/tset/Xlib3/XWidthOfScreen/XWidthOfScreen.m b/xts5/Xlib3/XWidthOfScreen/XWidthOfScreen.m
index 9a56a187..9a56a187 100644
--- a/xts5/tset/Xlib3/XWidthOfScreen/XWidthOfScreen.m
+++ b/xts5/Xlib3/XWidthOfScreen/XWidthOfScreen.m
diff --git a/xts5/tset/Xlib4/.gitignore b/xts5/Xlib4/.gitignore
index d6cfbac8..d6cfbac8 100644
--- a/xts5/tset/Xlib4/.gitignore
+++ b/xts5/Xlib4/.gitignore
diff --git a/xts5/tset/Xlib4/Makefile.am b/xts5/Xlib4/Makefile.am
index 9758c5d2..9758c5d2 100644
--- a/xts5/tset/Xlib4/Makefile.am
+++ b/xts5/Xlib4/Makefile.am
diff --git a/xts5/tset/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m b/xts5/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m
index c724c3a6..c724c3a6 100644
--- a/xts5/tset/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m
+++ b/xts5/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes.m
diff --git a/xts5/tset/Xlib4/XChangeWindowAttributes/a13.dat b/xts5/Xlib4/XChangeWindowAttributes/a13.dat
index bc9832c8..bc9832c8 100644
--- a/xts5/tset/Xlib4/XChangeWindowAttributes/a13.dat
+++ b/xts5/Xlib4/XChangeWindowAttributes/a13.dat
diff --git a/xts5/tset/Xlib4/XChangeWindowAttributes/a17.dat b/xts5/Xlib4/XChangeWindowAttributes/a17.dat
index 707bac3c..707bac3c 100644
--- a/xts5/tset/Xlib4/XChangeWindowAttributes/a17.dat
+++ b/xts5/Xlib4/XChangeWindowAttributes/a17.dat
diff --git a/xts5/tset/Xlib4/XChangeWindowAttributes/a2.dat b/xts5/Xlib4/XChangeWindowAttributes/a2.dat
index b28a0d51..b28a0d51 100644
--- a/xts5/tset/Xlib4/XChangeWindowAttributes/a2.dat
+++ b/xts5/Xlib4/XChangeWindowAttributes/a2.dat
diff --git a/xts5/tset/Xlib4/XChangeWindowAttributes/a3.dat b/xts5/Xlib4/XChangeWindowAttributes/a3.dat
index b63df031..b63df031 100644
--- a/xts5/tset/Xlib4/XChangeWindowAttributes/a3.dat
+++ b/xts5/Xlib4/XChangeWindowAttributes/a3.dat
diff --git a/xts5/tset/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m b/xts5/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m
index 178f8bfb..178f8bfb 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m
+++ b/xts5/Xlib4/XCirculateSubwindows/XCirculateSubwindows.m
diff --git a/xts5/tset/Xlib4/XCirculateSubwindows/a1.dat b/xts5/Xlib4/XCirculateSubwindows/a1.dat
index 4249a2c8..4249a2c8 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindows/a1.dat
+++ b/xts5/Xlib4/XCirculateSubwindows/a1.dat
diff --git a/xts5/tset/Xlib4/XCirculateSubwindows/a2.dat b/xts5/Xlib4/XCirculateSubwindows/a2.dat
index 99f37a26..99f37a26 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindows/a2.dat
+++ b/xts5/Xlib4/XCirculateSubwindows/a2.dat
diff --git a/xts5/tset/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m b/xts5/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m
index 17797fc4..17797fc4 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m
+++ b/xts5/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown.m
diff --git a/xts5/tset/Xlib4/XCirculateSubwindowsDown/a1.dat b/xts5/Xlib4/XCirculateSubwindowsDown/a1.dat
index dd6f431e..dd6f431e 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindowsDown/a1.dat
+++ b/xts5/Xlib4/XCirculateSubwindowsDown/a1.dat
diff --git a/xts5/tset/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m b/xts5/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m
index 26e182fa..26e182fa 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m
+++ b/xts5/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp.m
diff --git a/xts5/tset/Xlib4/XCirculateSubwindowsUp/a1.dat b/xts5/Xlib4/XCirculateSubwindowsUp/a1.dat
index 8bfd2981..8bfd2981 100644
--- a/xts5/tset/Xlib4/XCirculateSubwindowsUp/a1.dat
+++ b/xts5/Xlib4/XCirculateSubwindowsUp/a1.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/XConfigureWindow.m b/xts5/Xlib4/XConfigureWindow/XConfigureWindow.m
index 103e2235..103e2235 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/XConfigureWindow.m
+++ b/xts5/Xlib4/XConfigureWindow/XConfigureWindow.m
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a10.dat b/xts5/Xlib4/XConfigureWindow/a10.dat
index b67f1bbd..b67f1bbd 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a10.dat
+++ b/xts5/Xlib4/XConfigureWindow/a10.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a11.dat b/xts5/Xlib4/XConfigureWindow/a11.dat
index 1980bc2d..1980bc2d 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a11.dat
+++ b/xts5/Xlib4/XConfigureWindow/a11.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a12.dat b/xts5/Xlib4/XConfigureWindow/a12.dat
index ddb462fb..ddb462fb 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a12.dat
+++ b/xts5/Xlib4/XConfigureWindow/a12.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a13.dat b/xts5/Xlib4/XConfigureWindow/a13.dat
index 26d00437..26d00437 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a13.dat
+++ b/xts5/Xlib4/XConfigureWindow/a13.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a14.dat b/xts5/Xlib4/XConfigureWindow/a14.dat
index e64ae619..e64ae619 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a14.dat
+++ b/xts5/Xlib4/XConfigureWindow/a14.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a15.dat b/xts5/Xlib4/XConfigureWindow/a15.dat
index 5ee38198..5ee38198 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a15.dat
+++ b/xts5/Xlib4/XConfigureWindow/a15.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a16.dat b/xts5/Xlib4/XConfigureWindow/a16.dat
index d5eb2cca..d5eb2cca 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a16.dat
+++ b/xts5/Xlib4/XConfigureWindow/a16.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a17.dat b/xts5/Xlib4/XConfigureWindow/a17.dat
index ccdbb352..ccdbb352 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a17.dat
+++ b/xts5/Xlib4/XConfigureWindow/a17.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a18.dat b/xts5/Xlib4/XConfigureWindow/a18.dat
index 77fa74b2..77fa74b2 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a18.dat
+++ b/xts5/Xlib4/XConfigureWindow/a18.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a19.dat b/xts5/Xlib4/XConfigureWindow/a19.dat
index 865c6f65..865c6f65 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a19.dat
+++ b/xts5/Xlib4/XConfigureWindow/a19.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a3.dat b/xts5/Xlib4/XConfigureWindow/a3.dat
index 36682b2b..36682b2b 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a3.dat
+++ b/xts5/Xlib4/XConfigureWindow/a3.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a6.dat b/xts5/Xlib4/XConfigureWindow/a6.dat
index b0a6dce0..b0a6dce0 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a6.dat
+++ b/xts5/Xlib4/XConfigureWindow/a6.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a7.dat b/xts5/Xlib4/XConfigureWindow/a7.dat
index e7f4ff50..e7f4ff50 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a7.dat
+++ b/xts5/Xlib4/XConfigureWindow/a7.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a8.dat b/xts5/Xlib4/XConfigureWindow/a8.dat
index 8c83938a..8c83938a 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a8.dat
+++ b/xts5/Xlib4/XConfigureWindow/a8.dat
diff --git a/xts5/tset/Xlib4/XConfigureWindow/a9.dat b/xts5/Xlib4/XConfigureWindow/a9.dat
index 51274e7d..51274e7d 100644
--- a/xts5/tset/Xlib4/XConfigureWindow/a9.dat
+++ b/xts5/Xlib4/XConfigureWindow/a9.dat
diff --git a/xts5/tset/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m b/xts5/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m
index 81377e5b..81377e5b 100644
--- a/xts5/tset/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m
+++ b/xts5/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow.m
diff --git a/xts5/tset/Xlib4/XCreateSimpleWindow/a4.dat b/xts5/Xlib4/XCreateSimpleWindow/a4.dat
index 74a87024..74a87024 100644
--- a/xts5/tset/Xlib4/XCreateSimpleWindow/a4.dat
+++ b/xts5/Xlib4/XCreateSimpleWindow/a4.dat
diff --git a/xts5/tset/Xlib4/XCreateWindow/XCreateWindow.m b/xts5/Xlib4/XCreateWindow/XCreateWindow.m
index a37dc788..a37dc788 100644
--- a/xts5/tset/Xlib4/XCreateWindow/XCreateWindow.m
+++ b/xts5/Xlib4/XCreateWindow/XCreateWindow.m
diff --git a/xts5/tset/Xlib4/XCreateWindow/a11.dat b/xts5/Xlib4/XCreateWindow/a11.dat
index ee769627..ee769627 100644
--- a/xts5/tset/Xlib4/XCreateWindow/a11.dat
+++ b/xts5/Xlib4/XCreateWindow/a11.dat
diff --git a/xts5/tset/Xlib4/XCreateWindow/a15.dat b/xts5/Xlib4/XCreateWindow/a15.dat
index b31cc047..b31cc047 100644
--- a/xts5/tset/Xlib4/XCreateWindow/a15.dat
+++ b/xts5/Xlib4/XCreateWindow/a15.dat
diff --git a/xts5/tset/Xlib4/XCreateWindow/commattr.mc b/xts5/Xlib4/XCreateWindow/commattr.mc
index 88596210..88596210 100644
--- a/xts5/tset/Xlib4/XCreateWindow/commattr.mc
+++ b/xts5/Xlib4/XCreateWindow/commattr.mc
diff --git a/xts5/tset/Xlib4/XDefineCursor/XDefineCursor.m b/xts5/Xlib4/XDefineCursor/XDefineCursor.m
index 1b659d51..1b659d51 100644
--- a/xts5/tset/Xlib4/XDefineCursor/XDefineCursor.m
+++ b/xts5/Xlib4/XDefineCursor/XDefineCursor.m
diff --git a/xts5/tset/Xlib4/XDestroySubwindows/XDestroySubwindows.m b/xts5/Xlib4/XDestroySubwindows/XDestroySubwindows.m
index 150d71a7..150d71a7 100644
--- a/xts5/tset/Xlib4/XDestroySubwindows/XDestroySubwindows.m
+++ b/xts5/Xlib4/XDestroySubwindows/XDestroySubwindows.m
diff --git a/xts5/tset/Xlib4/XDestroyWindow/XDestroyWindow.m b/xts5/Xlib4/XDestroyWindow/XDestroyWindow.m
index 864a3315..864a3315 100644
--- a/xts5/tset/Xlib4/XDestroyWindow/XDestroyWindow.m
+++ b/xts5/Xlib4/XDestroyWindow/XDestroyWindow.m
diff --git a/xts5/tset/Xlib4/XLowerWindow/XLowerWindow.m b/xts5/Xlib4/XLowerWindow/XLowerWindow.m
index 70f50235..70f50235 100644
--- a/xts5/tset/Xlib4/XLowerWindow/XLowerWindow.m
+++ b/xts5/Xlib4/XLowerWindow/XLowerWindow.m
diff --git a/xts5/tset/Xlib4/XLowerWindow/a1.dat b/xts5/Xlib4/XLowerWindow/a1.dat
index 63c4a206..63c4a206 100644
--- a/xts5/tset/Xlib4/XLowerWindow/a1.dat
+++ b/xts5/Xlib4/XLowerWindow/a1.dat
diff --git a/xts5/tset/Xlib4/XMapRaised/XMapRaised.m b/xts5/Xlib4/XMapRaised/XMapRaised.m
index 198b97dc..198b97dc 100644
--- a/xts5/tset/Xlib4/XMapRaised/XMapRaised.m
+++ b/xts5/Xlib4/XMapRaised/XMapRaised.m
diff --git a/xts5/tset/Xlib4/XMapRaised/a1.dat b/xts5/Xlib4/XMapRaised/a1.dat
index b09e8a83..b09e8a83 100644
--- a/xts5/tset/Xlib4/XMapRaised/a1.dat
+++ b/xts5/Xlib4/XMapRaised/a1.dat
diff --git a/xts5/tset/Xlib4/XMapRaised/a4.dat b/xts5/Xlib4/XMapRaised/a4.dat
index 8120a819..8120a819 100644
--- a/xts5/tset/Xlib4/XMapRaised/a4.dat
+++ b/xts5/Xlib4/XMapRaised/a4.dat
diff --git a/xts5/tset/Xlib4/XMapSubwindows/XMapSubwindows.m b/xts5/Xlib4/XMapSubwindows/XMapSubwindows.m
index cca65f60..cca65f60 100644
--- a/xts5/tset/Xlib4/XMapSubwindows/XMapSubwindows.m
+++ b/xts5/Xlib4/XMapSubwindows/XMapSubwindows.m
diff --git a/xts5/tset/Xlib4/XMapSubwindows/a1.dat b/xts5/Xlib4/XMapSubwindows/a1.dat
index ef96b97f..ef96b97f 100644
--- a/xts5/tset/Xlib4/XMapSubwindows/a1.dat
+++ b/xts5/Xlib4/XMapSubwindows/a1.dat
diff --git a/xts5/tset/Xlib4/XMapWindow/XMapWindow.m b/xts5/Xlib4/XMapWindow/XMapWindow.m
index 7f817ae8..7f817ae8 100644
--- a/xts5/tset/Xlib4/XMapWindow/XMapWindow.m
+++ b/xts5/Xlib4/XMapWindow/XMapWindow.m
diff --git a/xts5/tset/Xlib4/XMapWindow/a4.dat b/xts5/Xlib4/XMapWindow/a4.dat
index 18d434e9..18d434e9 100644
--- a/xts5/tset/Xlib4/XMapWindow/a4.dat
+++ b/xts5/Xlib4/XMapWindow/a4.dat
diff --git a/xts5/tset/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m b/xts5/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m
index 31f2f7ee..31f2f7ee 100644
--- a/xts5/tset/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m
+++ b/xts5/Xlib4/XMoveResizeWindow/XMoveResizeWindow.m
diff --git a/xts5/tset/Xlib4/XMoveResizeWindow/a2.dat b/xts5/Xlib4/XMoveResizeWindow/a2.dat
index 4dbddb64..4dbddb64 100644
--- a/xts5/tset/Xlib4/XMoveResizeWindow/a2.dat
+++ b/xts5/Xlib4/XMoveResizeWindow/a2.dat
diff --git a/xts5/tset/Xlib4/XMoveWindow/XMoveWindow.m b/xts5/Xlib4/XMoveWindow/XMoveWindow.m
index d09b0260..d09b0260 100644
--- a/xts5/tset/Xlib4/XMoveWindow/XMoveWindow.m
+++ b/xts5/Xlib4/XMoveWindow/XMoveWindow.m
diff --git a/xts5/tset/Xlib4/XRaiseWindow/XRaiseWindow.m b/xts5/Xlib4/XRaiseWindow/XRaiseWindow.m
index 011d9f2c..011d9f2c 100644
--- a/xts5/tset/Xlib4/XRaiseWindow/XRaiseWindow.m
+++ b/xts5/Xlib4/XRaiseWindow/XRaiseWindow.m
diff --git a/xts5/tset/Xlib4/XRaiseWindow/a1.dat b/xts5/Xlib4/XRaiseWindow/a1.dat
index 79d3cb55..79d3cb55 100644
--- a/xts5/tset/Xlib4/XRaiseWindow/a1.dat
+++ b/xts5/Xlib4/XRaiseWindow/a1.dat
diff --git a/xts5/tset/Xlib4/XResizeWindow/XResizeWindow.m b/xts5/Xlib4/XResizeWindow/XResizeWindow.m
index 359324dd..359324dd 100644
--- a/xts5/tset/Xlib4/XResizeWindow/XResizeWindow.m
+++ b/xts5/Xlib4/XResizeWindow/XResizeWindow.m
diff --git a/xts5/tset/Xlib4/XResizeWindow/a2.dat b/xts5/Xlib4/XResizeWindow/a2.dat
index 20fcc208..20fcc208 100644
--- a/xts5/tset/Xlib4/XResizeWindow/a2.dat
+++ b/xts5/Xlib4/XResizeWindow/a2.dat
diff --git a/xts5/tset/Xlib4/XRestackWindows/XRestackWindows.m b/xts5/Xlib4/XRestackWindows/XRestackWindows.m
index f75138d3..f75138d3 100644
--- a/xts5/tset/Xlib4/XRestackWindows/XRestackWindows.m
+++ b/xts5/Xlib4/XRestackWindows/XRestackWindows.m
diff --git a/xts5/tset/Xlib4/XRestackWindows/a1.dat b/xts5/Xlib4/XRestackWindows/a1.dat
index 50a1a73d..50a1a73d 100644
--- a/xts5/tset/Xlib4/XRestackWindows/a1.dat
+++ b/xts5/Xlib4/XRestackWindows/a1.dat
diff --git a/xts5/tset/Xlib4/XRestackWindows/a2.dat b/xts5/Xlib4/XRestackWindows/a2.dat
index ceced4dd..ceced4dd 100644
--- a/xts5/tset/Xlib4/XRestackWindows/a2.dat
+++ b/xts5/Xlib4/XRestackWindows/a2.dat
diff --git a/xts5/tset/Xlib4/XRestackWindows/a3.dat b/xts5/Xlib4/XRestackWindows/a3.dat
index 7a03cee3..7a03cee3 100644
--- a/xts5/tset/Xlib4/XRestackWindows/a3.dat
+++ b/xts5/Xlib4/XRestackWindows/a3.dat
diff --git a/xts5/tset/Xlib4/XSetWindowBackground/XSetWindowBackground.m b/xts5/Xlib4/XSetWindowBackground/XSetWindowBackground.m
index 73175f19..73175f19 100644
--- a/xts5/tset/Xlib4/XSetWindowBackground/XSetWindowBackground.m
+++ b/xts5/Xlib4/XSetWindowBackground/XSetWindowBackground.m
diff --git a/xts5/tset/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap.m b/xts5/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap.m
index 27993ce2..27993ce2 100644
--- a/xts5/tset/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap.m
+++ b/xts5/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap.m
diff --git a/xts5/tset/Xlib4/XSetWindowBorder/XSetWindowBorder.m b/xts5/Xlib4/XSetWindowBorder/XSetWindowBorder.m
index 92f4a6ce..92f4a6ce 100644
--- a/xts5/tset/Xlib4/XSetWindowBorder/XSetWindowBorder.m
+++ b/xts5/Xlib4/XSetWindowBorder/XSetWindowBorder.m
diff --git a/xts5/tset/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m b/xts5/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m
index ff2e0b21..ff2e0b21 100644
--- a/xts5/tset/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m
+++ b/xts5/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap.m
diff --git a/xts5/tset/Xlib4/XSetWindowBorderPixmap/a1.dat b/xts5/Xlib4/XSetWindowBorderPixmap/a1.dat
index f290e3cb..f290e3cb 100644
--- a/xts5/tset/Xlib4/XSetWindowBorderPixmap/a1.dat
+++ b/xts5/Xlib4/XSetWindowBorderPixmap/a1.dat
diff --git a/xts5/tset/Xlib4/XSetWindowBorderPixmap/a2.dat b/xts5/Xlib4/XSetWindowBorderPixmap/a2.dat
index 545ac858..545ac858 100644
--- a/xts5/tset/Xlib4/XSetWindowBorderPixmap/a2.dat
+++ b/xts5/Xlib4/XSetWindowBorderPixmap/a2.dat
diff --git a/xts5/tset/Xlib4/XSetWindowBorderPixmap/a3.dat b/xts5/Xlib4/XSetWindowBorderPixmap/a3.dat
index dd92fd45..dd92fd45 100644
--- a/xts5/tset/Xlib4/XSetWindowBorderPixmap/a3.dat
+++ b/xts5/Xlib4/XSetWindowBorderPixmap/a3.dat
diff --git a/xts5/tset/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth.m b/xts5/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth.m
index 77926bfd..77926bfd 100644
--- a/xts5/tset/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth.m
+++ b/xts5/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth.m
diff --git a/xts5/tset/Xlib4/XSetWindowBorderWidth/a1.dat b/xts5/Xlib4/XSetWindowBorderWidth/a1.dat
index a256bcdf..a256bcdf 100644
--- a/xts5/tset/Xlib4/XSetWindowBorderWidth/a1.dat
+++ b/xts5/Xlib4/XSetWindowBorderWidth/a1.dat
diff --git a/xts5/tset/Xlib4/XSetWindowColormap/XSetWindowColormap.m b/xts5/Xlib4/XSetWindowColormap/XSetWindowColormap.m
index 2e1cd9ad..2e1cd9ad 100644
--- a/xts5/tset/Xlib4/XSetWindowColormap/XSetWindowColormap.m
+++ b/xts5/Xlib4/XSetWindowColormap/XSetWindowColormap.m
diff --git a/xts5/tset/Xlib4/XUndefineCursor/XUndefineCursor.m b/xts5/Xlib4/XUndefineCursor/XUndefineCursor.m
index 40e66476..40e66476 100644
--- a/xts5/tset/Xlib4/XUndefineCursor/XUndefineCursor.m
+++ b/xts5/Xlib4/XUndefineCursor/XUndefineCursor.m
diff --git a/xts5/tset/Xlib4/XUnmapSubwindows/XUnmapSubwindows.m b/xts5/Xlib4/XUnmapSubwindows/XUnmapSubwindows.m
index 0ef04ace..0ef04ace 100644
--- a/xts5/tset/Xlib4/XUnmapSubwindows/XUnmapSubwindows.m
+++ b/xts5/Xlib4/XUnmapSubwindows/XUnmapSubwindows.m
diff --git a/xts5/tset/Xlib4/XUnmapWindow/XUnmapWindow.m b/xts5/Xlib4/XUnmapWindow/XUnmapWindow.m
index 88bf46ee..88bf46ee 100644
--- a/xts5/tset/Xlib4/XUnmapWindow/XUnmapWindow.m
+++ b/xts5/Xlib4/XUnmapWindow/XUnmapWindow.m
diff --git a/xts5/tset/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual.m b/xts5/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual.m
index 59b485ea..59b485ea 100644
--- a/xts5/tset/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual.m
+++ b/xts5/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual.m
diff --git a/xts5/tset/Xlib5/.gitignore b/xts5/Xlib5/.gitignore
index 998d811b..998d811b 100644
--- a/xts5/tset/Xlib5/.gitignore
+++ b/xts5/Xlib5/.gitignore
diff --git a/xts5/tset/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am
index 9931325b..9931325b 100644
--- a/xts5/tset/Xlib5/Makefile.am
+++ b/xts5/Xlib5/Makefile.am
diff --git a/xts5/tset/Xlib5/XChangeProperty/XChangeProperty.m b/xts5/Xlib5/XChangeProperty/XChangeProperty.m
index ca265aa9..ca265aa9 100644
--- a/xts5/tset/Xlib5/XChangeProperty/XChangeProperty.m
+++ b/xts5/Xlib5/XChangeProperty/XChangeProperty.m
diff --git a/xts5/tset/Xlib5/XConvertSelection/XConvertSelection.m b/xts5/Xlib5/XConvertSelection/XConvertSelection.m
index 6c979825..6c979825 100644
--- a/xts5/tset/Xlib5/XConvertSelection/XConvertSelection.m
+++ b/xts5/Xlib5/XConvertSelection/XConvertSelection.m
diff --git a/xts5/tset/Xlib5/XDeleteProperty/XDeleteProperty.m b/xts5/Xlib5/XDeleteProperty/XDeleteProperty.m
index 1ccca1c8..1ccca1c8 100644
--- a/xts5/tset/Xlib5/XDeleteProperty/XDeleteProperty.m
+++ b/xts5/Xlib5/XDeleteProperty/XDeleteProperty.m
diff --git a/xts5/tset/Xlib5/XGetAtomName/XGetAtomName.m b/xts5/Xlib5/XGetAtomName/XGetAtomName.m
index 37d76a55..37d76a55 100644
--- a/xts5/tset/Xlib5/XGetAtomName/XGetAtomName.m
+++ b/xts5/Xlib5/XGetAtomName/XGetAtomName.m
diff --git a/xts5/tset/Xlib5/XGetGeometry/XGetGeometry.m b/xts5/Xlib5/XGetGeometry/XGetGeometry.m
index 328eeb73..328eeb73 100644
--- a/xts5/tset/Xlib5/XGetGeometry/XGetGeometry.m
+++ b/xts5/Xlib5/XGetGeometry/XGetGeometry.m
diff --git a/xts5/tset/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m b/xts5/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m
index e962b634..e962b634 100644
--- a/xts5/tset/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m
+++ b/xts5/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m
diff --git a/xts5/tset/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m b/xts5/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m
index 7c9ea804..7c9ea804 100644
--- a/xts5/tset/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m
+++ b/xts5/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m
diff --git a/xts5/tset/Xlib5/XGetWindowProperty/XGetWindowProperty.m b/xts5/Xlib5/XGetWindowProperty/XGetWindowProperty.m
index 31c9ab87..31c9ab87 100644
--- a/xts5/tset/Xlib5/XGetWindowProperty/XGetWindowProperty.m
+++ b/xts5/Xlib5/XGetWindowProperty/XGetWindowProperty.m
diff --git a/xts5/tset/Xlib5/XInternAtom/XInternAtom.m b/xts5/Xlib5/XInternAtom/XInternAtom.m
index 8d16d0d8..8d16d0d8 100644
--- a/xts5/tset/Xlib5/XInternAtom/XInternAtom.m
+++ b/xts5/Xlib5/XInternAtom/XInternAtom.m
diff --git a/xts5/tset/Xlib5/XListProperties/XListProperties.m b/xts5/Xlib5/XListProperties/XListProperties.m
index 64b4d8c7..64b4d8c7 100644
--- a/xts5/tset/Xlib5/XListProperties/XListProperties.m
+++ b/xts5/Xlib5/XListProperties/XListProperties.m
diff --git a/xts5/tset/Xlib5/XQueryPointer/XQueryPointer.m b/xts5/Xlib5/XQueryPointer/XQueryPointer.m
index 62ae37b9..62ae37b9 100644
--- a/xts5/tset/Xlib5/XQueryPointer/XQueryPointer.m
+++ b/xts5/Xlib5/XQueryPointer/XQueryPointer.m
diff --git a/xts5/tset/Xlib5/XQueryTree/XQueryTree.m b/xts5/Xlib5/XQueryTree/XQueryTree.m
index dbfffcf4..dbfffcf4 100644
--- a/xts5/tset/Xlib5/XQueryTree/XQueryTree.m
+++ b/xts5/Xlib5/XQueryTree/XQueryTree.m
diff --git a/xts5/tset/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m b/xts5/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m
index 831086de..831086de 100644
--- a/xts5/tset/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m
+++ b/xts5/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m
diff --git a/xts5/tset/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m b/xts5/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m
index 33152954..33152954 100644
--- a/xts5/tset/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m
+++ b/xts5/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m
diff --git a/xts5/tset/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m b/xts5/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m
index 27e11c98..27e11c98 100644
--- a/xts5/tset/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m
+++ b/xts5/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m
diff --git a/xts5/tset/Xlib6/.gitignore b/xts5/Xlib6/.gitignore
index e0121367..e0121367 100644
--- a/xts5/tset/Xlib6/.gitignore
+++ b/xts5/Xlib6/.gitignore
diff --git a/xts5/tset/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am
index 5a229aed..5a229aed 100644
--- a/xts5/tset/Xlib6/Makefile.am
+++ b/xts5/Xlib6/Makefile.am
diff --git a/xts5/tset/Xlib6/XCreateFontCursor/XCreateFontCursor.m b/xts5/Xlib6/XCreateFontCursor/XCreateFontCursor.m
index 19cef6b3..19cef6b3 100644
--- a/xts5/tset/Xlib6/XCreateFontCursor/XCreateFontCursor.m
+++ b/xts5/Xlib6/XCreateFontCursor/XCreateFontCursor.m
diff --git a/xts5/tset/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m b/xts5/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m
index c3f27f8a..c3f27f8a 100644
--- a/xts5/tset/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m
+++ b/xts5/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m
diff --git a/xts5/tset/Xlib6/XCreatePixmap/XCreatePixmap.m b/xts5/Xlib6/XCreatePixmap/XCreatePixmap.m
index 4bac3d69..4bac3d69 100644
--- a/xts5/tset/Xlib6/XCreatePixmap/XCreatePixmap.m
+++ b/xts5/Xlib6/XCreatePixmap/XCreatePixmap.m
diff --git a/xts5/tset/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m b/xts5/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m
index 558abaa4..558abaa4 100644
--- a/xts5/tset/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m
+++ b/xts5/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m
diff --git a/xts5/tset/Xlib6/XFreeCursor/XFreeCursor.m b/xts5/Xlib6/XFreeCursor/XFreeCursor.m
index 0c20103a..0c20103a 100644
--- a/xts5/tset/Xlib6/XFreeCursor/XFreeCursor.m
+++ b/xts5/Xlib6/XFreeCursor/XFreeCursor.m
diff --git a/xts5/tset/Xlib6/XFreePixmap/XFreePixmap.m b/xts5/Xlib6/XFreePixmap/XFreePixmap.m
index 864d6ce0..864d6ce0 100644
--- a/xts5/tset/Xlib6/XFreePixmap/XFreePixmap.m
+++ b/xts5/Xlib6/XFreePixmap/XFreePixmap.m
diff --git a/xts5/tset/Xlib6/XQueryBestCursor/XQueryBestCursor.m b/xts5/Xlib6/XQueryBestCursor/XQueryBestCursor.m
index 7049b088..7049b088 100644
--- a/xts5/tset/Xlib6/XQueryBestCursor/XQueryBestCursor.m
+++ b/xts5/Xlib6/XQueryBestCursor/XQueryBestCursor.m
diff --git a/xts5/tset/Xlib6/XRecolorCursor/XRecolorCursor.m b/xts5/Xlib6/XRecolorCursor/XRecolorCursor.m
index bcd567ae..bcd567ae 100644
--- a/xts5/tset/Xlib6/XRecolorCursor/XRecolorCursor.m
+++ b/xts5/Xlib6/XRecolorCursor/XRecolorCursor.m
diff --git a/xts5/tset/Xlib7/.gitignore b/xts5/Xlib7/.gitignore
index de55143c..de55143c 100644
--- a/xts5/tset/Xlib7/.gitignore
+++ b/xts5/Xlib7/.gitignore
diff --git a/xts5/tset/Xlib7/Makefile.am b/xts5/Xlib7/Makefile.am
index 57351e27..57351e27 100644
--- a/xts5/tset/Xlib7/Makefile.am
+++ b/xts5/Xlib7/Makefile.am
diff --git a/xts5/tset/Xlib7/XAllocColor/XAllocColor.m b/xts5/Xlib7/XAllocColor/XAllocColor.m
index 107b8ab6..107b8ab6 100644
--- a/xts5/tset/Xlib7/XAllocColor/XAllocColor.m
+++ b/xts5/Xlib7/XAllocColor/XAllocColor.m
diff --git a/xts5/tset/Xlib7/XAllocColorCells/XAllocColorCells.m b/xts5/Xlib7/XAllocColorCells/XAllocColorCells.m
index 4c0af61f..4c0af61f 100644
--- a/xts5/tset/Xlib7/XAllocColorCells/XAllocColorCells.m
+++ b/xts5/Xlib7/XAllocColorCells/XAllocColorCells.m
diff --git a/xts5/tset/Xlib7/XAllocColorPlanes/XAllocColorPlanes.m b/xts5/Xlib7/XAllocColorPlanes/XAllocColorPlanes.m
index 45064a84..45064a84 100644
--- a/xts5/tset/Xlib7/XAllocColorPlanes/XAllocColorPlanes.m
+++ b/xts5/Xlib7/XAllocColorPlanes/XAllocColorPlanes.m
diff --git a/xts5/tset/Xlib7/XAllocNamedColor/XAllocNamedColor.m b/xts5/Xlib7/XAllocNamedColor/XAllocNamedColor.m
index 56611d24..56611d24 100644
--- a/xts5/tset/Xlib7/XAllocNamedColor/XAllocNamedColor.m
+++ b/xts5/Xlib7/XAllocNamedColor/XAllocNamedColor.m
diff --git a/xts5/tset/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree.m b/xts5/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree.m
index 2fa77664..2fa77664 100644
--- a/xts5/tset/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree.m
+++ b/xts5/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree.m
diff --git a/xts5/tset/Xlib7/XCreateColormap/XCreateColormap.m b/xts5/Xlib7/XCreateColormap/XCreateColormap.m
index 7842de23..7842de23 100644
--- a/xts5/tset/Xlib7/XCreateColormap/XCreateColormap.m
+++ b/xts5/Xlib7/XCreateColormap/XCreateColormap.m
diff --git a/xts5/tset/Xlib7/XFreeColormap/XFreeColormap.m b/xts5/Xlib7/XFreeColormap/XFreeColormap.m
index 637014d3..637014d3 100644
--- a/xts5/tset/Xlib7/XFreeColormap/XFreeColormap.m
+++ b/xts5/Xlib7/XFreeColormap/XFreeColormap.m
diff --git a/xts5/tset/Xlib7/XFreeColors/XFreeColors.m b/xts5/Xlib7/XFreeColors/XFreeColors.m
index bfa5cb34..bfa5cb34 100644
--- a/xts5/tset/Xlib7/XFreeColors/XFreeColors.m
+++ b/xts5/Xlib7/XFreeColors/XFreeColors.m
diff --git a/xts5/tset/Xlib7/XLookupColor/XLookupColor.m b/xts5/Xlib7/XLookupColor/XLookupColor.m
index a4369e43..a4369e43 100644
--- a/xts5/tset/Xlib7/XLookupColor/XLookupColor.m
+++ b/xts5/Xlib7/XLookupColor/XLookupColor.m
diff --git a/xts5/tset/Xlib7/XParseColor/XParseColor.m b/xts5/Xlib7/XParseColor/XParseColor.m
index 69c76c82..69c76c82 100644
--- a/xts5/tset/Xlib7/XParseColor/XParseColor.m
+++ b/xts5/Xlib7/XParseColor/XParseColor.m
diff --git a/xts5/tset/Xlib7/XQueryColor/XQueryColor.m b/xts5/Xlib7/XQueryColor/XQueryColor.m
index 38a39f6f..38a39f6f 100644
--- a/xts5/tset/Xlib7/XQueryColor/XQueryColor.m
+++ b/xts5/Xlib7/XQueryColor/XQueryColor.m
diff --git a/xts5/tset/Xlib7/XQueryColors/XQueryColors.m b/xts5/Xlib7/XQueryColors/XQueryColors.m
index 1a99006d..1a99006d 100644
--- a/xts5/tset/Xlib7/XQueryColors/XQueryColors.m
+++ b/xts5/Xlib7/XQueryColors/XQueryColors.m
diff --git a/xts5/tset/Xlib7/XStoreColor/XStoreColor.m b/xts5/Xlib7/XStoreColor/XStoreColor.m
index d6c4aefe..d6c4aefe 100644
--- a/xts5/tset/Xlib7/XStoreColor/XStoreColor.m
+++ b/xts5/Xlib7/XStoreColor/XStoreColor.m
diff --git a/xts5/tset/Xlib7/XStoreColors/XStoreColors.m b/xts5/Xlib7/XStoreColors/XStoreColors.m
index d7965f46..d7965f46 100644
--- a/xts5/tset/Xlib7/XStoreColors/XStoreColors.m
+++ b/xts5/Xlib7/XStoreColors/XStoreColors.m
diff --git a/xts5/tset/Xlib7/XStoreNamedColor/XStoreNamedColor.m b/xts5/Xlib7/XStoreNamedColor/XStoreNamedColor.m
index 35ff30cf..35ff30cf 100644
--- a/xts5/tset/Xlib7/XStoreNamedColor/XStoreNamedColor.m
+++ b/xts5/Xlib7/XStoreNamedColor/XStoreNamedColor.m
diff --git a/xts5/tset/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace.m b/xts5/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace.m
index 01d67f3d..01d67f3d 100644
--- a/xts5/tset/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace.m
+++ b/xts5/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace.m
diff --git a/xts5/tset/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet.m b/xts5/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet.m
index f8e41eed..f8e41eed 100644
--- a/xts5/tset/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet.m
+++ b/xts5/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet.m
diff --git a/xts5/tset/Xlib7/XcmsAllocColor/XcmsAllocColor.m b/xts5/Xlib7/XcmsAllocColor/XcmsAllocColor.m
index 8bcedcbd..8bcedcbd 100644
--- a/xts5/tset/Xlib7/XcmsAllocColor/XcmsAllocColor.m
+++ b/xts5/Xlib7/XcmsAllocColor/XcmsAllocColor.m
diff --git a/xts5/tset/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor.m b/xts5/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor.m
index 98281ed3..98281ed3 100644
--- a/xts5/tset/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor.m
+++ b/xts5/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor.m
diff --git a/xts5/tset/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap.m b/xts5/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap.m
index 1c811f07..1c811f07 100644
--- a/xts5/tset/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap.m
+++ b/xts5/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap.m
diff --git a/xts5/tset/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC.m b/xts5/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC.m
index b6577d62..b6577d62 100644
--- a/xts5/tset/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC.m
diff --git a/xts5/tset/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL.m b/xts5/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL.m
index 8707c994..8707c994 100644
--- a/xts5/tset/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL.m
diff --git a/xts5/tset/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC.m b/xts5/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC.m
index e443ee1c..e443ee1c 100644
--- a/xts5/tset/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC.m
diff --git a/xts5/tset/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL.m b/xts5/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL.m
index 11d2ae19..11d2ae19 100644
--- a/xts5/tset/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL.m
+++ b/xts5/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL.m
diff --git a/xts5/tset/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC.m b/xts5/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC.m
index ef43b26b..ef43b26b 100644
--- a/xts5/tset/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC.m
diff --git a/xts5/tset/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL.m b/xts5/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL.m
index 7c9a3a1d..7c9a3a1d 100644
--- a/xts5/tset/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL.m
diff --git a/xts5/tset/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC.m b/xts5/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC.m
index ff74255b..ff74255b 100644
--- a/xts5/tset/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC.m
diff --git a/xts5/tset/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL.m b/xts5/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL.m
index 60ac7279..60ac7279 100644
--- a/xts5/tset/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL.m
+++ b/xts5/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL.m
diff --git a/xts5/tset/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC.m b/xts5/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC.m
index 0555abd2..0555abd2 100644
--- a/xts5/tset/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC.m
+++ b/xts5/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC.m
diff --git a/xts5/tset/Xlib7/XcmsConversionProc/XcmsConversionProc.m b/xts5/Xlib7/XcmsConversionProc/XcmsConversionProc.m
index b429342f..b429342f 100644
--- a/xts5/tset/Xlib7/XcmsConversionProc/XcmsConversionProc.m
+++ b/xts5/Xlib7/XcmsConversionProc/XcmsConversionProc.m
diff --git a/xts5/tset/Xlib7/XcmsConversionProc/cmscprocd/XcmsConversionProc.m b/xts5/Xlib7/XcmsConversionProc/cmscprocd/XcmsConversionProc.m
index 2f176d4a..2f176d4a 100644
--- a/xts5/tset/Xlib7/XcmsConversionProc/cmscprocd/XcmsConversionProc.m
+++ b/xts5/Xlib7/XcmsConversionProc/cmscprocd/XcmsConversionProc.m
diff --git a/xts5/tset/Xlib7/XcmsConvertColors/XcmsConvertColors.m b/xts5/Xlib7/XcmsConvertColors/XcmsConvertColors.m
index 16904571..16904571 100644
--- a/xts5/tset/Xlib7/XcmsConvertColors/XcmsConvertColors.m
+++ b/xts5/Xlib7/XcmsConvertColors/XcmsConvertColors.m
diff --git a/xts5/tset/Xlib7/XcmsCreateCCC/XcmsCreateCCC.m b/xts5/Xlib7/XcmsCreateCCC/XcmsCreateCCC.m
index bed5a8f9..bed5a8f9 100644
--- a/xts5/tset/Xlib7/XcmsCreateCCC/XcmsCreateCCC.m
+++ b/xts5/Xlib7/XcmsCreateCCC/XcmsCreateCCC.m
diff --git a/xts5/tset/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC.m b/xts5/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC.m
index 921f437c..921f437c 100644
--- a/xts5/tset/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC.m
+++ b/xts5/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC.m
diff --git a/xts5/tset/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC.m b/xts5/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC.m
index 29b69183..29b69183 100644
--- a/xts5/tset/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC.m
+++ b/xts5/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC.m
diff --git a/xts5/tset/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix.m b/xts5/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix.m
index 8216be97..8216be97 100644
--- a/xts5/tset/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix.m
+++ b/xts5/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix.m
diff --git a/xts5/tset/Xlib7/XcmsFreeCCC/XcmsFreeCCC.m b/xts5/Xlib7/XcmsFreeCCC/XcmsFreeCCC.m
index 67192ff2..67192ff2 100644
--- a/xts5/tset/Xlib7/XcmsFreeCCC/XcmsFreeCCC.m
+++ b/xts5/Xlib7/XcmsFreeCCC/XcmsFreeCCC.m
diff --git a/xts5/tset/Xlib7/XcmsLookupColor/XcmsLookupColor.m b/xts5/Xlib7/XcmsLookupColor/XcmsLookupColor.m
index 16dc6468..16dc6468 100644
--- a/xts5/tset/Xlib7/XcmsLookupColor/XcmsLookupColor.m
+++ b/xts5/Xlib7/XcmsLookupColor/XcmsLookupColor.m
diff --git a/xts5/tset/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat.m b/xts5/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat.m
index 5401344a..5401344a 100644
--- a/xts5/tset/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat.m
+++ b/xts5/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat.m
diff --git a/xts5/tset/Xlib7/XcmsQueryBlack/XcmsQueryBlack.m b/xts5/Xlib7/XcmsQueryBlack/XcmsQueryBlack.m
index 5462f0de..5462f0de 100644
--- a/xts5/tset/Xlib7/XcmsQueryBlack/XcmsQueryBlack.m
+++ b/xts5/Xlib7/XcmsQueryBlack/XcmsQueryBlack.m
diff --git a/xts5/tset/Xlib7/XcmsQueryBlue/XcmsQueryBlue.m b/xts5/Xlib7/XcmsQueryBlue/XcmsQueryBlue.m
index e55ba1bf..e55ba1bf 100644
--- a/xts5/tset/Xlib7/XcmsQueryBlue/XcmsQueryBlue.m
+++ b/xts5/Xlib7/XcmsQueryBlue/XcmsQueryBlue.m
diff --git a/xts5/tset/Xlib7/XcmsQueryColor/XcmsQueryColor.m b/xts5/Xlib7/XcmsQueryColor/XcmsQueryColor.m
index 3c5e112a..3c5e112a 100644
--- a/xts5/tset/Xlib7/XcmsQueryColor/XcmsQueryColor.m
+++ b/xts5/Xlib7/XcmsQueryColor/XcmsQueryColor.m
diff --git a/xts5/tset/Xlib7/XcmsQueryColors/XcmsQueryColors.m b/xts5/Xlib7/XcmsQueryColors/XcmsQueryColors.m
index f48ab6a8..f48ab6a8 100644
--- a/xts5/tset/Xlib7/XcmsQueryColors/XcmsQueryColors.m
+++ b/xts5/Xlib7/XcmsQueryColors/XcmsQueryColors.m
diff --git a/xts5/tset/Xlib7/XcmsQueryGreen/XcmsQueryGreen.m b/xts5/Xlib7/XcmsQueryGreen/XcmsQueryGreen.m
index 882c95ae..882c95ae 100644
--- a/xts5/tset/Xlib7/XcmsQueryGreen/XcmsQueryGreen.m
+++ b/xts5/Xlib7/XcmsQueryGreen/XcmsQueryGreen.m
diff --git a/xts5/tset/Xlib7/XcmsQueryRed/XcmsQueryRed.m b/xts5/Xlib7/XcmsQueryRed/XcmsQueryRed.m
index e01d6c99..e01d6c99 100644
--- a/xts5/tset/Xlib7/XcmsQueryRed/XcmsQueryRed.m
+++ b/xts5/Xlib7/XcmsQueryRed/XcmsQueryRed.m
diff --git a/xts5/tset/Xlib7/XcmsQueryWhite/XcmsQueryWhite.m b/xts5/Xlib7/XcmsQueryWhite/XcmsQueryWhite.m
index 87363f64..87363f64 100644
--- a/xts5/tset/Xlib7/XcmsQueryWhite/XcmsQueryWhite.m
+++ b/xts5/Xlib7/XcmsQueryWhite/XcmsQueryWhite.m
diff --git a/xts5/tset/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC.m b/xts5/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC.m
index 19c30d76..19c30d76 100644
--- a/xts5/tset/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC.m
+++ b/xts5/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC.m
diff --git a/xts5/tset/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC.m b/xts5/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC.m
index 0729f519..0729f519 100644
--- a/xts5/tset/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC.m
+++ b/xts5/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC.m
diff --git a/xts5/tset/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc.m b/xts5/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc.m
index 9d565c9e..9d565c9e 100644
--- a/xts5/tset/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc.m
+++ b/xts5/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc.m
diff --git a/xts5/tset/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint.m b/xts5/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint.m
index 85218916..85218916 100644
--- a/xts5/tset/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint.m
+++ b/xts5/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint.m
diff --git a/xts5/tset/Xlib7/XcmsStoreColor/XcmsStoreColor.m b/xts5/Xlib7/XcmsStoreColor/XcmsStoreColor.m
index 9fb96333..9fb96333 100644
--- a/xts5/tset/Xlib7/XcmsStoreColor/XcmsStoreColor.m
+++ b/xts5/Xlib7/XcmsStoreColor/XcmsStoreColor.m
diff --git a/xts5/tset/Xlib7/XcmsStoreColors/XcmsStoreColors.m b/xts5/Xlib7/XcmsStoreColors/XcmsStoreColors.m
index 5eac0dae..5eac0dae 100644
--- a/xts5/tset/Xlib7/XcmsStoreColors/XcmsStoreColors.m
+++ b/xts5/Xlib7/XcmsStoreColors/XcmsStoreColors.m
diff --git a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC.m b/xts5/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC.m
index a3c1847d..a3c1847d 100644
--- a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC.m
diff --git a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV.m b/xts5/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV.m
index 715ecbee..715ecbee 100644
--- a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV.m
diff --git a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC.m b/xts5/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC.m
index 6311a1e6..6311a1e6 100644
--- a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC.m
diff --git a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples.m b/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples.m
index bf2ed913..bf2ed913 100644
--- a/xts5/tset/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples.m
diff --git a/xts5/tset/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV.m b/xts5/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV.m
index 4bd145b3..4bd145b3 100644
--- a/xts5/tset/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV.m
+++ b/xts5/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV.m
diff --git a/xts5/tset/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC.m b/xts5/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC.m
index 9eb613bc..9eb613bc 100644
--- a/xts5/tset/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC.m
+++ b/xts5/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC.m
diff --git a/xts5/tset/Xlib8/.gitignore b/xts5/Xlib8/.gitignore
index 136ee306..136ee306 100644
--- a/xts5/tset/Xlib8/.gitignore
+++ b/xts5/Xlib8/.gitignore
diff --git a/xts5/tset/Xlib8/Makefile.am b/xts5/Xlib8/Makefile.am
index 8fe5a345..8fe5a345 100644
--- a/xts5/tset/Xlib8/Makefile.am
+++ b/xts5/Xlib8/Makefile.am
diff --git a/xts5/tset/Xlib8/XChangeGC/XChangeGC.m b/xts5/Xlib8/XChangeGC/XChangeGC.m
index 5264f911..5264f911 100644
--- a/xts5/tset/Xlib8/XChangeGC/XChangeGC.m
+++ b/xts5/Xlib8/XChangeGC/XChangeGC.m
diff --git a/xts5/tset/Xlib8/XCopyGC/XCopyGC.m b/xts5/Xlib8/XCopyGC/XCopyGC.m
index 6e3b2525..6e3b2525 100644
--- a/xts5/tset/Xlib8/XCopyGC/XCopyGC.m
+++ b/xts5/Xlib8/XCopyGC/XCopyGC.m
diff --git a/xts5/tset/Xlib8/XCreateGC/XCreateGC.m b/xts5/Xlib8/XCreateGC/XCreateGC.m
index 7ca6f6f2..7ca6f6f2 100644
--- a/xts5/tset/Xlib8/XCreateGC/XCreateGC.m
+++ b/xts5/Xlib8/XCreateGC/XCreateGC.m
diff --git a/xts5/tset/Xlib8/XFlushGC/XFlushGC.m b/xts5/Xlib8/XFlushGC/XFlushGC.m
index 5714c863..5714c863 100644
--- a/xts5/tset/Xlib8/XFlushGC/XFlushGC.m
+++ b/xts5/Xlib8/XFlushGC/XFlushGC.m
diff --git a/xts5/tset/Xlib8/XFreeGC/XFreeGC.m b/xts5/Xlib8/XFreeGC/XFreeGC.m
index cc539616..cc539616 100644
--- a/xts5/tset/Xlib8/XFreeGC/XFreeGC.m
+++ b/xts5/Xlib8/XFreeGC/XFreeGC.m
diff --git a/xts5/tset/Xlib8/XGContextFromGC/XGContextFromGC.m b/xts5/Xlib8/XGContextFromGC/XGContextFromGC.m
index 9f483c11..9f483c11 100644
--- a/xts5/tset/Xlib8/XGContextFromGC/XGContextFromGC.m
+++ b/xts5/Xlib8/XGContextFromGC/XGContextFromGC.m
diff --git a/xts5/tset/Xlib8/XGetGCValues/XGetGCValues.m b/xts5/Xlib8/XGetGCValues/XGetGCValues.m
index 77d16b67..77d16b67 100644
--- a/xts5/tset/Xlib8/XGetGCValues/XGetGCValues.m
+++ b/xts5/Xlib8/XGetGCValues/XGetGCValues.m
diff --git a/xts5/tset/Xlib8/XQueryBestSize/XQueryBestSize.m b/xts5/Xlib8/XQueryBestSize/XQueryBestSize.m
index ed75cff1..ed75cff1 100644
--- a/xts5/tset/Xlib8/XQueryBestSize/XQueryBestSize.m
+++ b/xts5/Xlib8/XQueryBestSize/XQueryBestSize.m
diff --git a/xts5/tset/Xlib8/XQueryBestStipple/XQueryBestStipple.m b/xts5/Xlib8/XQueryBestStipple/XQueryBestStipple.m
index f3040513..f3040513 100644
--- a/xts5/tset/Xlib8/XQueryBestStipple/XQueryBestStipple.m
+++ b/xts5/Xlib8/XQueryBestStipple/XQueryBestStipple.m
diff --git a/xts5/tset/Xlib8/XQueryBestTile/XQueryBestTile.m b/xts5/Xlib8/XQueryBestTile/XQueryBestTile.m
index 2de3591c..2de3591c 100644
--- a/xts5/tset/Xlib8/XQueryBestTile/XQueryBestTile.m
+++ b/xts5/Xlib8/XQueryBestTile/XQueryBestTile.m
diff --git a/xts5/tset/Xlib8/XSetArcMode/XSetArcMode.m b/xts5/Xlib8/XSetArcMode/XSetArcMode.m
index 93851b26..93851b26 100644
--- a/xts5/tset/Xlib8/XSetArcMode/XSetArcMode.m
+++ b/xts5/Xlib8/XSetArcMode/XSetArcMode.m
diff --git a/xts5/tset/Xlib8/XSetBackground/XSetBackground.m b/xts5/Xlib8/XSetBackground/XSetBackground.m
index d216ccc1..d216ccc1 100644
--- a/xts5/tset/Xlib8/XSetBackground/XSetBackground.m
+++ b/xts5/Xlib8/XSetBackground/XSetBackground.m
diff --git a/xts5/tset/Xlib8/XSetClipMask/XSetClipMask.m b/xts5/Xlib8/XSetClipMask/XSetClipMask.m
index 761fbd04..761fbd04 100644
--- a/xts5/tset/Xlib8/XSetClipMask/XSetClipMask.m
+++ b/xts5/Xlib8/XSetClipMask/XSetClipMask.m
diff --git a/xts5/tset/Xlib8/XSetClipOrigin/XSetClipOrigin.m b/xts5/Xlib8/XSetClipOrigin/XSetClipOrigin.m
index f8a21d51..f8a21d51 100644
--- a/xts5/tset/Xlib8/XSetClipOrigin/XSetClipOrigin.m
+++ b/xts5/Xlib8/XSetClipOrigin/XSetClipOrigin.m
diff --git a/xts5/tset/Xlib8/XSetClipRectangles/XSetClipRectangles.m b/xts5/Xlib8/XSetClipRectangles/XSetClipRectangles.m
index 3a1d1518..3a1d1518 100644
--- a/xts5/tset/Xlib8/XSetClipRectangles/XSetClipRectangles.m
+++ b/xts5/Xlib8/XSetClipRectangles/XSetClipRectangles.m
diff --git a/xts5/tset/Xlib8/XSetDashes/XSetDashes.m b/xts5/Xlib8/XSetDashes/XSetDashes.m
index dacfeaee..dacfeaee 100644
--- a/xts5/tset/Xlib8/XSetDashes/XSetDashes.m
+++ b/xts5/Xlib8/XSetDashes/XSetDashes.m
diff --git a/xts5/tset/Xlib8/XSetFillRule/XSetFillRule.m b/xts5/Xlib8/XSetFillRule/XSetFillRule.m
index 0a2e1680..0a2e1680 100644
--- a/xts5/tset/Xlib8/XSetFillRule/XSetFillRule.m
+++ b/xts5/Xlib8/XSetFillRule/XSetFillRule.m
diff --git a/xts5/tset/Xlib8/XSetFillStyle/XSetFillStyle.m b/xts5/Xlib8/XSetFillStyle/XSetFillStyle.m
index 8a57794f..8a57794f 100644
--- a/xts5/tset/Xlib8/XSetFillStyle/XSetFillStyle.m
+++ b/xts5/Xlib8/XSetFillStyle/XSetFillStyle.m
diff --git a/xts5/tset/Xlib8/XSetFont/XSetFont.m b/xts5/Xlib8/XSetFont/XSetFont.m
index 9f61c8da..9f61c8da 100644
--- a/xts5/tset/Xlib8/XSetFont/XSetFont.m
+++ b/xts5/Xlib8/XSetFont/XSetFont.m
diff --git a/xts5/tset/Xlib8/XSetForeground/XSetForeground.m b/xts5/Xlib8/XSetForeground/XSetForeground.m
index bf6f8a53..bf6f8a53 100644
--- a/xts5/tset/Xlib8/XSetForeground/XSetForeground.m
+++ b/xts5/Xlib8/XSetForeground/XSetForeground.m
diff --git a/xts5/tset/Xlib8/XSetFunction/XSetFunction.m b/xts5/Xlib8/XSetFunction/XSetFunction.m
index 038c87c6..038c87c6 100644
--- a/xts5/tset/Xlib8/XSetFunction/XSetFunction.m
+++ b/xts5/Xlib8/XSetFunction/XSetFunction.m
diff --git a/xts5/tset/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures.m b/xts5/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures.m
index 24594881..24594881 100644
--- a/xts5/tset/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures.m
+++ b/xts5/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures.m
diff --git a/xts5/tset/Xlib8/XSetLineAttributes/XSetLineAttributes.m b/xts5/Xlib8/XSetLineAttributes/XSetLineAttributes.m
index 2950da12..2950da12 100644
--- a/xts5/tset/Xlib8/XSetLineAttributes/XSetLineAttributes.m
+++ b/xts5/Xlib8/XSetLineAttributes/XSetLineAttributes.m
diff --git a/xts5/tset/Xlib8/XSetPlaneMask/XSetPlaneMask.m b/xts5/Xlib8/XSetPlaneMask/XSetPlaneMask.m
index 77469ba9..77469ba9 100644
--- a/xts5/tset/Xlib8/XSetPlaneMask/XSetPlaneMask.m
+++ b/xts5/Xlib8/XSetPlaneMask/XSetPlaneMask.m
diff --git a/xts5/tset/Xlib8/XSetState/XSetState.m b/xts5/Xlib8/XSetState/XSetState.m
index 723a3be7..723a3be7 100644
--- a/xts5/tset/Xlib8/XSetState/XSetState.m
+++ b/xts5/Xlib8/XSetState/XSetState.m
diff --git a/xts5/tset/Xlib8/XSetStipple/XSetStipple.m b/xts5/Xlib8/XSetStipple/XSetStipple.m
index 7efe82c7..7efe82c7 100644
--- a/xts5/tset/Xlib8/XSetStipple/XSetStipple.m
+++ b/xts5/Xlib8/XSetStipple/XSetStipple.m
diff --git a/xts5/tset/Xlib8/XSetSubwindowMode/XSetSubwindowMode.m b/xts5/Xlib8/XSetSubwindowMode/XSetSubwindowMode.m
index b5298bec..b5298bec 100644
--- a/xts5/tset/Xlib8/XSetSubwindowMode/XSetSubwindowMode.m
+++ b/xts5/Xlib8/XSetSubwindowMode/XSetSubwindowMode.m
diff --git a/xts5/tset/Xlib8/XSetTSOrigin/XSetTSOrigin.m b/xts5/Xlib8/XSetTSOrigin/XSetTSOrigin.m
index 3611a535..3611a535 100644
--- a/xts5/tset/Xlib8/XSetTSOrigin/XSetTSOrigin.m
+++ b/xts5/Xlib8/XSetTSOrigin/XSetTSOrigin.m
diff --git a/xts5/tset/Xlib8/XSetTile/XSetTile.m b/xts5/Xlib8/XSetTile/XSetTile.m
index f1d7461d..f1d7461d 100644
--- a/xts5/tset/Xlib8/XSetTile/XSetTile.m
+++ b/xts5/Xlib8/XSetTile/XSetTile.m
diff --git a/xts5/tset/Xlib9/.gitignore b/xts5/Xlib9/.gitignore
index 01237a91..01237a91 100644
--- a/xts5/tset/Xlib9/.gitignore
+++ b/xts5/Xlib9/.gitignore
diff --git a/xts5/tset/Xlib9/Makefile.am b/xts5/Xlib9/Makefile.am
index b27329ef..b27329ef 100644
--- a/xts5/tset/Xlib9/Makefile.am
+++ b/xts5/Xlib9/Makefile.am
diff --git a/xts5/tset/Xlib9/XClearArea/XClearArea.m b/xts5/Xlib9/XClearArea/XClearArea.m
index 2da14b20..2da14b20 100644
--- a/xts5/tset/Xlib9/XClearArea/XClearArea.m
+++ b/xts5/Xlib9/XClearArea/XClearArea.m
diff --git a/xts5/tset/Xlib9/XClearWindow/XClearWindow.m b/xts5/Xlib9/XClearWindow/XClearWindow.m
index d8b93d4b..d8b93d4b 100644
--- a/xts5/tset/Xlib9/XClearWindow/XClearWindow.m
+++ b/xts5/Xlib9/XClearWindow/XClearWindow.m
diff --git a/xts5/tset/Xlib9/XCopyArea/XCopyArea.m b/xts5/Xlib9/XCopyArea/XCopyArea.m
index 07640447..07640447 100644
--- a/xts5/tset/Xlib9/XCopyArea/XCopyArea.m
+++ b/xts5/Xlib9/XCopyArea/XCopyArea.m
diff --git a/xts5/tset/Xlib9/XCopyArea/a27.dat b/xts5/Xlib9/XCopyArea/a27.dat
index 122ca5ef..122ca5ef 100644
--- a/xts5/tset/Xlib9/XCopyArea/a27.dat
+++ b/xts5/Xlib9/XCopyArea/a27.dat
diff --git a/xts5/tset/Xlib9/XCopyArea/a30.dat b/xts5/Xlib9/XCopyArea/a30.dat
index 5fa55e3f..5fa55e3f 100644
--- a/xts5/tset/Xlib9/XCopyArea/a30.dat
+++ b/xts5/Xlib9/XCopyArea/a30.dat
diff --git a/xts5/tset/Xlib9/XCopyPlane/XCopyPlane.m b/xts5/Xlib9/XCopyPlane/XCopyPlane.m
index 5416f12b..5416f12b 100644
--- a/xts5/tset/Xlib9/XCopyPlane/XCopyPlane.m
+++ b/xts5/Xlib9/XCopyPlane/XCopyPlane.m
diff --git a/xts5/tset/Xlib9/XCopyPlane/a26.dat b/xts5/Xlib9/XCopyPlane/a26.dat
index de9982a1..de9982a1 100644
--- a/xts5/tset/Xlib9/XCopyPlane/a26.dat
+++ b/xts5/Xlib9/XCopyPlane/a26.dat
diff --git a/xts5/tset/Xlib9/XCopyPlane/a28.dat b/xts5/Xlib9/XCopyPlane/a28.dat
index 37f12698..37f12698 100644
--- a/xts5/tset/Xlib9/XCopyPlane/a28.dat
+++ b/xts5/Xlib9/XCopyPlane/a28.dat
diff --git a/xts5/tset/Xlib9/XCopyPlane/a33.dat b/xts5/Xlib9/XCopyPlane/a33.dat
index 3a9f99e4..3a9f99e4 100644
--- a/xts5/tset/Xlib9/XCopyPlane/a33.dat
+++ b/xts5/Xlib9/XCopyPlane/a33.dat
diff --git a/xts5/tset/Xlib9/XCopyPlane/a36.dat b/xts5/Xlib9/XCopyPlane/a36.dat
index 1a4a59c9..1a4a59c9 100644
--- a/xts5/tset/Xlib9/XCopyPlane/a36.dat
+++ b/xts5/Xlib9/XCopyPlane/a36.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/XDrawArc.m b/xts5/Xlib9/XDrawArc/XDrawArc.m
index 2fccb714..2fccb714 100644
--- a/xts5/tset/Xlib9/XDrawArc/XDrawArc.m
+++ b/xts5/Xlib9/XDrawArc/XDrawArc.m
diff --git a/xts5/tset/Xlib9/XDrawArc/a1.dat b/xts5/Xlib9/XDrawArc/a1.dat
index 9da0db46..9da0db46 100644
--- a/xts5/tset/Xlib9/XDrawArc/a1.dat
+++ b/xts5/Xlib9/XDrawArc/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a34.dat b/xts5/Xlib9/XDrawArc/a34.dat
index 8d0e26b8..8d0e26b8 100644
--- a/xts5/tset/Xlib9/XDrawArc/a34.dat
+++ b/xts5/Xlib9/XDrawArc/a34.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a42.dat b/xts5/Xlib9/XDrawArc/a42.dat
index 8663615d..8663615d 100644
--- a/xts5/tset/Xlib9/XDrawArc/a42.dat
+++ b/xts5/Xlib9/XDrawArc/a42.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a49.dat b/xts5/Xlib9/XDrawArc/a49.dat
index 6495d5c1..6495d5c1 100644
--- a/xts5/tset/Xlib9/XDrawArc/a49.dat
+++ b/xts5/Xlib9/XDrawArc/a49.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a5.dat b/xts5/Xlib9/XDrawArc/a5.dat
index d3bac42d..d3bac42d 100644
--- a/xts5/tset/Xlib9/XDrawArc/a5.dat
+++ b/xts5/Xlib9/XDrawArc/a5.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a50.dat b/xts5/Xlib9/XDrawArc/a50.dat
index 632c6e2f..632c6e2f 100644
--- a/xts5/tset/Xlib9/XDrawArc/a50.dat
+++ b/xts5/Xlib9/XDrawArc/a50.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a51.dat b/xts5/Xlib9/XDrawArc/a51.dat
index 8b03fef6..8b03fef6 100644
--- a/xts5/tset/Xlib9/XDrawArc/a51.dat
+++ b/xts5/Xlib9/XDrawArc/a51.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a52.dat b/xts5/Xlib9/XDrawArc/a52.dat
index f710bec8..f710bec8 100644
--- a/xts5/tset/Xlib9/XDrawArc/a52.dat
+++ b/xts5/Xlib9/XDrawArc/a52.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a53.dat b/xts5/Xlib9/XDrawArc/a53.dat
index 77c1bd24..77c1bd24 100644
--- a/xts5/tset/Xlib9/XDrawArc/a53.dat
+++ b/xts5/Xlib9/XDrawArc/a53.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a54.dat b/xts5/Xlib9/XDrawArc/a54.dat
index dca3c0ec..dca3c0ec 100644
--- a/xts5/tset/Xlib9/XDrawArc/a54.dat
+++ b/xts5/Xlib9/XDrawArc/a54.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a55.dat b/xts5/Xlib9/XDrawArc/a55.dat
index 74a484f1..74a484f1 100644
--- a/xts5/tset/Xlib9/XDrawArc/a55.dat
+++ b/xts5/Xlib9/XDrawArc/a55.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a6.dat b/xts5/Xlib9/XDrawArc/a6.dat
index eea7692c..eea7692c 100644
--- a/xts5/tset/Xlib9/XDrawArc/a6.dat
+++ b/xts5/Xlib9/XDrawArc/a6.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a64.dat b/xts5/Xlib9/XDrawArc/a64.dat
index 2c968268..2c968268 100644
--- a/xts5/tset/Xlib9/XDrawArc/a64.dat
+++ b/xts5/Xlib9/XDrawArc/a64.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a66.dat b/xts5/Xlib9/XDrawArc/a66.dat
index 8d085557..8d085557 100644
--- a/xts5/tset/Xlib9/XDrawArc/a66.dat
+++ b/xts5/Xlib9/XDrawArc/a66.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a68.dat b/xts5/Xlib9/XDrawArc/a68.dat
index 5c88234c..5c88234c 100644
--- a/xts5/tset/Xlib9/XDrawArc/a68.dat
+++ b/xts5/Xlib9/XDrawArc/a68.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a73.dat b/xts5/Xlib9/XDrawArc/a73.dat
index c27d2531..c27d2531 100644
--- a/xts5/tset/Xlib9/XDrawArc/a73.dat
+++ b/xts5/Xlib9/XDrawArc/a73.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a76.dat b/xts5/Xlib9/XDrawArc/a76.dat
index d1da621d..d1da621d 100644
--- a/xts5/tset/Xlib9/XDrawArc/a76.dat
+++ b/xts5/Xlib9/XDrawArc/a76.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a77.dat b/xts5/Xlib9/XDrawArc/a77.dat
index 2ec46e81..2ec46e81 100644
--- a/xts5/tset/Xlib9/XDrawArc/a77.dat
+++ b/xts5/Xlib9/XDrawArc/a77.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a78.dat b/xts5/Xlib9/XDrawArc/a78.dat
index 00522ea0..00522ea0 100644
--- a/xts5/tset/Xlib9/XDrawArc/a78.dat
+++ b/xts5/Xlib9/XDrawArc/a78.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a79.dat b/xts5/Xlib9/XDrawArc/a79.dat
index c8a1585f..c8a1585f 100644
--- a/xts5/tset/Xlib9/XDrawArc/a79.dat
+++ b/xts5/Xlib9/XDrawArc/a79.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a83.dat b/xts5/Xlib9/XDrawArc/a83.dat
index 9da5a224..9da5a224 100644
--- a/xts5/tset/Xlib9/XDrawArc/a83.dat
+++ b/xts5/Xlib9/XDrawArc/a83.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a86.dat b/xts5/Xlib9/XDrawArc/a86.dat
index 74a68339..74a68339 100644
--- a/xts5/tset/Xlib9/XDrawArc/a86.dat
+++ b/xts5/Xlib9/XDrawArc/a86.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a88.dat b/xts5/Xlib9/XDrawArc/a88.dat
index 284f8145..284f8145 100644
--- a/xts5/tset/Xlib9/XDrawArc/a88.dat
+++ b/xts5/Xlib9/XDrawArc/a88.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a90.dat b/xts5/Xlib9/XDrawArc/a90.dat
index c6a84801..c6a84801 100644
--- a/xts5/tset/Xlib9/XDrawArc/a90.dat
+++ b/xts5/Xlib9/XDrawArc/a90.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a92.dat b/xts5/Xlib9/XDrawArc/a92.dat
index 0ebb3393..0ebb3393 100644
--- a/xts5/tset/Xlib9/XDrawArc/a92.dat
+++ b/xts5/Xlib9/XDrawArc/a92.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a93.dat b/xts5/Xlib9/XDrawArc/a93.dat
index 1557df34..1557df34 100644
--- a/xts5/tset/Xlib9/XDrawArc/a93.dat
+++ b/xts5/Xlib9/XDrawArc/a93.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a94.dat b/xts5/Xlib9/XDrawArc/a94.dat
index 3722fde4..3722fde4 100644
--- a/xts5/tset/Xlib9/XDrawArc/a94.dat
+++ b/xts5/Xlib9/XDrawArc/a94.dat
diff --git a/xts5/tset/Xlib9/XDrawArc/a95.dat b/xts5/Xlib9/XDrawArc/a95.dat
index 06cb30c7..06cb30c7 100644
--- a/xts5/tset/Xlib9/XDrawArc/a95.dat
+++ b/xts5/Xlib9/XDrawArc/a95.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/XDrawArcs.m b/xts5/Xlib9/XDrawArcs/XDrawArcs.m
index 176a4fad..176a4fad 100644
--- a/xts5/tset/Xlib9/XDrawArcs/XDrawArcs.m
+++ b/xts5/Xlib9/XDrawArcs/XDrawArcs.m
diff --git a/xts5/tset/Xlib9/XDrawArcs/a1.dat b/xts5/Xlib9/XDrawArcs/a1.dat
index c0cd30fc..c0cd30fc 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a1.dat
+++ b/xts5/Xlib9/XDrawArcs/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a100.dat b/xts5/Xlib9/XDrawArcs/a100.dat
index dd4d3a67..dd4d3a67 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a100.dat
+++ b/xts5/Xlib9/XDrawArcs/a100.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a102.dat b/xts5/Xlib9/XDrawArcs/a102.dat
index b630b2bd..b630b2bd 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a102.dat
+++ b/xts5/Xlib9/XDrawArcs/a102.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a103.dat b/xts5/Xlib9/XDrawArcs/a103.dat
index 3c550e14..3c550e14 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a103.dat
+++ b/xts5/Xlib9/XDrawArcs/a103.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a104.dat b/xts5/Xlib9/XDrawArcs/a104.dat
index b80ce4b0..b80ce4b0 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a104.dat
+++ b/xts5/Xlib9/XDrawArcs/a104.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a105.dat b/xts5/Xlib9/XDrawArcs/a105.dat
index e2643483..e2643483 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a105.dat
+++ b/xts5/Xlib9/XDrawArcs/a105.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a12.dat b/xts5/Xlib9/XDrawArcs/a12.dat
index 9feee501..9feee501 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a12.dat
+++ b/xts5/Xlib9/XDrawArcs/a12.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a37.dat b/xts5/Xlib9/XDrawArcs/a37.dat
index b18fc42e..b18fc42e 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a37.dat
+++ b/xts5/Xlib9/XDrawArcs/a37.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a45.dat b/xts5/Xlib9/XDrawArcs/a45.dat
index 9688b9db..9688b9db 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a45.dat
+++ b/xts5/Xlib9/XDrawArcs/a45.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a5.dat b/xts5/Xlib9/XDrawArcs/a5.dat
index d4f1e121..d4f1e121 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a5.dat
+++ b/xts5/Xlib9/XDrawArcs/a5.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a52.dat b/xts5/Xlib9/XDrawArcs/a52.dat
index b5e0ec58..b5e0ec58 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a52.dat
+++ b/xts5/Xlib9/XDrawArcs/a52.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a53.dat b/xts5/Xlib9/XDrawArcs/a53.dat
index d6b3c19a..d6b3c19a 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a53.dat
+++ b/xts5/Xlib9/XDrawArcs/a53.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a54.dat b/xts5/Xlib9/XDrawArcs/a54.dat
index e4cfc096..e4cfc096 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a54.dat
+++ b/xts5/Xlib9/XDrawArcs/a54.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a55.dat b/xts5/Xlib9/XDrawArcs/a55.dat
index ddaab6a0..ddaab6a0 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a55.dat
+++ b/xts5/Xlib9/XDrawArcs/a55.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a56.dat b/xts5/Xlib9/XDrawArcs/a56.dat
index c3f85621..c3f85621 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a56.dat
+++ b/xts5/Xlib9/XDrawArcs/a56.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a57.dat b/xts5/Xlib9/XDrawArcs/a57.dat
index 3491e678..3491e678 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a57.dat
+++ b/xts5/Xlib9/XDrawArcs/a57.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a58.dat b/xts5/Xlib9/XDrawArcs/a58.dat
index ca0db8cf..ca0db8cf 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a58.dat
+++ b/xts5/Xlib9/XDrawArcs/a58.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a6.dat b/xts5/Xlib9/XDrawArcs/a6.dat
index 7417f3ac..7417f3ac 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a6.dat
+++ b/xts5/Xlib9/XDrawArcs/a6.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a67.dat b/xts5/Xlib9/XDrawArcs/a67.dat
index 91f18c93..91f18c93 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a67.dat
+++ b/xts5/Xlib9/XDrawArcs/a67.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a69.dat b/xts5/Xlib9/XDrawArcs/a69.dat
index c854a024..c854a024 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a69.dat
+++ b/xts5/Xlib9/XDrawArcs/a69.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a7.dat b/xts5/Xlib9/XDrawArcs/a7.dat
index 5ca1b1a8..5ca1b1a8 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a7.dat
+++ b/xts5/Xlib9/XDrawArcs/a7.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a71.dat b/xts5/Xlib9/XDrawArcs/a71.dat
index e0753ce1..e0753ce1 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a71.dat
+++ b/xts5/Xlib9/XDrawArcs/a71.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a76.dat b/xts5/Xlib9/XDrawArcs/a76.dat
index 10362495..10362495 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a76.dat
+++ b/xts5/Xlib9/XDrawArcs/a76.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a79.dat b/xts5/Xlib9/XDrawArcs/a79.dat
index 139224d1..139224d1 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a79.dat
+++ b/xts5/Xlib9/XDrawArcs/a79.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a80.dat b/xts5/Xlib9/XDrawArcs/a80.dat
index d4e715c1..d4e715c1 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a80.dat
+++ b/xts5/Xlib9/XDrawArcs/a80.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a81.dat b/xts5/Xlib9/XDrawArcs/a81.dat
index fb8f5a2d..fb8f5a2d 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a81.dat
+++ b/xts5/Xlib9/XDrawArcs/a81.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a82.dat b/xts5/Xlib9/XDrawArcs/a82.dat
index d6e5c32b..d6e5c32b 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a82.dat
+++ b/xts5/Xlib9/XDrawArcs/a82.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a86.dat b/xts5/Xlib9/XDrawArcs/a86.dat
index 6ed12abb..6ed12abb 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a86.dat
+++ b/xts5/Xlib9/XDrawArcs/a86.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a87.dat b/xts5/Xlib9/XDrawArcs/a87.dat
index 837b7e0f..837b7e0f 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a87.dat
+++ b/xts5/Xlib9/XDrawArcs/a87.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a88.dat b/xts5/Xlib9/XDrawArcs/a88.dat
index a06e79db..a06e79db 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a88.dat
+++ b/xts5/Xlib9/XDrawArcs/a88.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a89.dat b/xts5/Xlib9/XDrawArcs/a89.dat
index 7c9be159..7c9be159 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a89.dat
+++ b/xts5/Xlib9/XDrawArcs/a89.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a93.dat b/xts5/Xlib9/XDrawArcs/a93.dat
index cc8bf666..cc8bf666 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a93.dat
+++ b/xts5/Xlib9/XDrawArcs/a93.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a96.dat b/xts5/Xlib9/XDrawArcs/a96.dat
index 33858195..33858195 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a96.dat
+++ b/xts5/Xlib9/XDrawArcs/a96.dat
diff --git a/xts5/tset/Xlib9/XDrawArcs/a98.dat b/xts5/Xlib9/XDrawArcs/a98.dat
index 4b91456c..4b91456c 100644
--- a/xts5/tset/Xlib9/XDrawArcs/a98.dat
+++ b/xts5/Xlib9/XDrawArcs/a98.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString/XDrawImageString.m b/xts5/Xlib9/XDrawImageString/XDrawImageString.m
index 93d51cb7..93d51cb7 100644
--- a/xts5/tset/Xlib9/XDrawImageString/XDrawImageString.m
+++ b/xts5/Xlib9/XDrawImageString/XDrawImageString.m
diff --git a/xts5/tset/Xlib9/XDrawImageString/a1.dat b/xts5/Xlib9/XDrawImageString/a1.dat
index 43be70dd..43be70dd 100644
--- a/xts5/tset/Xlib9/XDrawImageString/a1.dat
+++ b/xts5/Xlib9/XDrawImageString/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString/a11.dat b/xts5/Xlib9/XDrawImageString/a11.dat
index 9e8982f8..9e8982f8 100644
--- a/xts5/tset/Xlib9/XDrawImageString/a11.dat
+++ b/xts5/Xlib9/XDrawImageString/a11.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString/a14.dat b/xts5/Xlib9/XDrawImageString/a14.dat
index b3351ff0..b3351ff0 100644
--- a/xts5/tset/Xlib9/XDrawImageString/a14.dat
+++ b/xts5/Xlib9/XDrawImageString/a14.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString/a16.dat b/xts5/Xlib9/XDrawImageString/a16.dat
index 40bae5fe..40bae5fe 100644
--- a/xts5/tset/Xlib9/XDrawImageString/a16.dat
+++ b/xts5/Xlib9/XDrawImageString/a16.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString/a18.dat b/xts5/Xlib9/XDrawImageString/a18.dat
index 2ec9f3ed..2ec9f3ed 100644
--- a/xts5/tset/Xlib9/XDrawImageString/a18.dat
+++ b/xts5/Xlib9/XDrawImageString/a18.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString/a3.dat b/xts5/Xlib9/XDrawImageString/a3.dat
index 96d0c8e0..96d0c8e0 100644
--- a/xts5/tset/Xlib9/XDrawImageString/a3.dat
+++ b/xts5/Xlib9/XDrawImageString/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString16/XDrawImageString16.m b/xts5/Xlib9/XDrawImageString16/XDrawImageString16.m
index a8a00d98..a8a00d98 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/XDrawImageString16.m
+++ b/xts5/Xlib9/XDrawImageString16/XDrawImageString16.m
diff --git a/xts5/tset/Xlib9/XDrawImageString16/a1.dat b/xts5/Xlib9/XDrawImageString16/a1.dat
index 53e88550..53e88550 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/a1.dat
+++ b/xts5/Xlib9/XDrawImageString16/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString16/a11.dat b/xts5/Xlib9/XDrawImageString16/a11.dat
index 0622a82b..0622a82b 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/a11.dat
+++ b/xts5/Xlib9/XDrawImageString16/a11.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString16/a14.dat b/xts5/Xlib9/XDrawImageString16/a14.dat
index 13541ea8..13541ea8 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/a14.dat
+++ b/xts5/Xlib9/XDrawImageString16/a14.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString16/a16.dat b/xts5/Xlib9/XDrawImageString16/a16.dat
index 7e9d78e5..7e9d78e5 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/a16.dat
+++ b/xts5/Xlib9/XDrawImageString16/a16.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString16/a18.dat b/xts5/Xlib9/XDrawImageString16/a18.dat
index 2c0d761e..2c0d761e 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/a18.dat
+++ b/xts5/Xlib9/XDrawImageString16/a18.dat
diff --git a/xts5/tset/Xlib9/XDrawImageString16/a3.dat b/xts5/Xlib9/XDrawImageString16/a3.dat
index 635aa988..635aa988 100644
--- a/xts5/tset/Xlib9/XDrawImageString16/a3.dat
+++ b/xts5/Xlib9/XDrawImageString16/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/XDrawLine.m b/xts5/Xlib9/XDrawLine/XDrawLine.m
index dc5d97d2..dc5d97d2 100644
--- a/xts5/tset/Xlib9/XDrawLine/XDrawLine.m
+++ b/xts5/Xlib9/XDrawLine/XDrawLine.m
diff --git a/xts5/tset/Xlib9/XDrawLine/a1.dat b/xts5/Xlib9/XDrawLine/a1.dat
index 027f1781..027f1781 100644
--- a/xts5/tset/Xlib9/XDrawLine/a1.dat
+++ b/xts5/Xlib9/XDrawLine/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a2.dat b/xts5/Xlib9/XDrawLine/a2.dat
index ad6adfa0..ad6adfa0 100644
--- a/xts5/tset/Xlib9/XDrawLine/a2.dat
+++ b/xts5/Xlib9/XDrawLine/a2.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a23.dat b/xts5/Xlib9/XDrawLine/a23.dat
index 3a91ccda..3a91ccda 100644
--- a/xts5/tset/Xlib9/XDrawLine/a23.dat
+++ b/xts5/Xlib9/XDrawLine/a23.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a3.dat b/xts5/Xlib9/XDrawLine/a3.dat
index 9e6054c0..9e6054c0 100644
--- a/xts5/tset/Xlib9/XDrawLine/a3.dat
+++ b/xts5/Xlib9/XDrawLine/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a31.dat b/xts5/Xlib9/XDrawLine/a31.dat
index 8b5d62a8..8b5d62a8 100644
--- a/xts5/tset/Xlib9/XDrawLine/a31.dat
+++ b/xts5/Xlib9/XDrawLine/a31.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a38.dat b/xts5/Xlib9/XDrawLine/a38.dat
index e3dbbad2..e3dbbad2 100644
--- a/xts5/tset/Xlib9/XDrawLine/a38.dat
+++ b/xts5/Xlib9/XDrawLine/a38.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a39.dat b/xts5/Xlib9/XDrawLine/a39.dat
index c4c3f824..c4c3f824 100644
--- a/xts5/tset/Xlib9/XDrawLine/a39.dat
+++ b/xts5/Xlib9/XDrawLine/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a4.dat b/xts5/Xlib9/XDrawLine/a4.dat
index d43f59ec..d43f59ec 100644
--- a/xts5/tset/Xlib9/XDrawLine/a4.dat
+++ b/xts5/Xlib9/XDrawLine/a4.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a40.dat b/xts5/Xlib9/XDrawLine/a40.dat
index 65161997..65161997 100644
--- a/xts5/tset/Xlib9/XDrawLine/a40.dat
+++ b/xts5/Xlib9/XDrawLine/a40.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a41.dat b/xts5/Xlib9/XDrawLine/a41.dat
index 11d16c93..11d16c93 100644
--- a/xts5/tset/Xlib9/XDrawLine/a41.dat
+++ b/xts5/Xlib9/XDrawLine/a41.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a42.dat b/xts5/Xlib9/XDrawLine/a42.dat
index 58587277..58587277 100644
--- a/xts5/tset/Xlib9/XDrawLine/a42.dat
+++ b/xts5/Xlib9/XDrawLine/a42.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a43.dat b/xts5/Xlib9/XDrawLine/a43.dat
index 802b6381..802b6381 100644
--- a/xts5/tset/Xlib9/XDrawLine/a43.dat
+++ b/xts5/Xlib9/XDrawLine/a43.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a44.dat b/xts5/Xlib9/XDrawLine/a44.dat
index dd2d21ae..dd2d21ae 100644
--- a/xts5/tset/Xlib9/XDrawLine/a44.dat
+++ b/xts5/Xlib9/XDrawLine/a44.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a53.dat b/xts5/Xlib9/XDrawLine/a53.dat
index 416438be..416438be 100644
--- a/xts5/tset/Xlib9/XDrawLine/a53.dat
+++ b/xts5/Xlib9/XDrawLine/a53.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a55.dat b/xts5/Xlib9/XDrawLine/a55.dat
index f65438c1..f65438c1 100644
--- a/xts5/tset/Xlib9/XDrawLine/a55.dat
+++ b/xts5/Xlib9/XDrawLine/a55.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a57.dat b/xts5/Xlib9/XDrawLine/a57.dat
index 46cb2177..46cb2177 100644
--- a/xts5/tset/Xlib9/XDrawLine/a57.dat
+++ b/xts5/Xlib9/XDrawLine/a57.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a62.dat b/xts5/Xlib9/XDrawLine/a62.dat
index 32b9345a..32b9345a 100644
--- a/xts5/tset/Xlib9/XDrawLine/a62.dat
+++ b/xts5/Xlib9/XDrawLine/a62.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a65.dat b/xts5/Xlib9/XDrawLine/a65.dat
index 59bbe38a..59bbe38a 100644
--- a/xts5/tset/Xlib9/XDrawLine/a65.dat
+++ b/xts5/Xlib9/XDrawLine/a65.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a66.dat b/xts5/Xlib9/XDrawLine/a66.dat
index 40d9c33c..40d9c33c 100644
--- a/xts5/tset/Xlib9/XDrawLine/a66.dat
+++ b/xts5/Xlib9/XDrawLine/a66.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a67.dat b/xts5/Xlib9/XDrawLine/a67.dat
index aa025d35..aa025d35 100644
--- a/xts5/tset/Xlib9/XDrawLine/a67.dat
+++ b/xts5/Xlib9/XDrawLine/a67.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a68.dat b/xts5/Xlib9/XDrawLine/a68.dat
index e7bafa02..e7bafa02 100644
--- a/xts5/tset/Xlib9/XDrawLine/a68.dat
+++ b/xts5/Xlib9/XDrawLine/a68.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a72.dat b/xts5/Xlib9/XDrawLine/a72.dat
index 0d870dec..0d870dec 100644
--- a/xts5/tset/Xlib9/XDrawLine/a72.dat
+++ b/xts5/Xlib9/XDrawLine/a72.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a75.dat b/xts5/Xlib9/XDrawLine/a75.dat
index 18ceb9bd..18ceb9bd 100644
--- a/xts5/tset/Xlib9/XDrawLine/a75.dat
+++ b/xts5/Xlib9/XDrawLine/a75.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a77.dat b/xts5/Xlib9/XDrawLine/a77.dat
index b54249c8..b54249c8 100644
--- a/xts5/tset/Xlib9/XDrawLine/a77.dat
+++ b/xts5/Xlib9/XDrawLine/a77.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a79.dat b/xts5/Xlib9/XDrawLine/a79.dat
index 522d5e1d..522d5e1d 100644
--- a/xts5/tset/Xlib9/XDrawLine/a79.dat
+++ b/xts5/Xlib9/XDrawLine/a79.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a81.dat b/xts5/Xlib9/XDrawLine/a81.dat
index 3521d146..3521d146 100644
--- a/xts5/tset/Xlib9/XDrawLine/a81.dat
+++ b/xts5/Xlib9/XDrawLine/a81.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a82.dat b/xts5/Xlib9/XDrawLine/a82.dat
index 109c9692..109c9692 100644
--- a/xts5/tset/Xlib9/XDrawLine/a82.dat
+++ b/xts5/Xlib9/XDrawLine/a82.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a83.dat b/xts5/Xlib9/XDrawLine/a83.dat
index e06a9428..e06a9428 100644
--- a/xts5/tset/Xlib9/XDrawLine/a83.dat
+++ b/xts5/Xlib9/XDrawLine/a83.dat
diff --git a/xts5/tset/Xlib9/XDrawLine/a84.dat b/xts5/Xlib9/XDrawLine/a84.dat
index 618c23bb..618c23bb 100644
--- a/xts5/tset/Xlib9/XDrawLine/a84.dat
+++ b/xts5/Xlib9/XDrawLine/a84.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/XDrawLines.m b/xts5/Xlib9/XDrawLines/XDrawLines.m
index 089465c7..089465c7 100644
--- a/xts5/tset/Xlib9/XDrawLines/XDrawLines.m
+++ b/xts5/Xlib9/XDrawLines/XDrawLines.m
diff --git a/xts5/tset/Xlib9/XDrawLines/a1.dat b/xts5/Xlib9/XDrawLines/a1.dat
index f415b7d6..f415b7d6 100644
--- a/xts5/tset/Xlib9/XDrawLines/a1.dat
+++ b/xts5/Xlib9/XDrawLines/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a28.dat b/xts5/Xlib9/XDrawLines/a28.dat
index 61c99ff0..61c99ff0 100644
--- a/xts5/tset/Xlib9/XDrawLines/a28.dat
+++ b/xts5/Xlib9/XDrawLines/a28.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a3.dat b/xts5/Xlib9/XDrawLines/a3.dat
index 203fd70b..203fd70b 100644
--- a/xts5/tset/Xlib9/XDrawLines/a3.dat
+++ b/xts5/Xlib9/XDrawLines/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a36.dat b/xts5/Xlib9/XDrawLines/a36.dat
index 47edb6f0..47edb6f0 100644
--- a/xts5/tset/Xlib9/XDrawLines/a36.dat
+++ b/xts5/Xlib9/XDrawLines/a36.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a4.dat b/xts5/Xlib9/XDrawLines/a4.dat
index 92b783fd..92b783fd 100644
--- a/xts5/tset/Xlib9/XDrawLines/a4.dat
+++ b/xts5/Xlib9/XDrawLines/a4.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a43.dat b/xts5/Xlib9/XDrawLines/a43.dat
index 1e2d5e40..1e2d5e40 100644
--- a/xts5/tset/Xlib9/XDrawLines/a43.dat
+++ b/xts5/Xlib9/XDrawLines/a43.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a44.dat b/xts5/Xlib9/XDrawLines/a44.dat
index a6e427bc..a6e427bc 100644
--- a/xts5/tset/Xlib9/XDrawLines/a44.dat
+++ b/xts5/Xlib9/XDrawLines/a44.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a45.dat b/xts5/Xlib9/XDrawLines/a45.dat
index 27530635..27530635 100644
--- a/xts5/tset/Xlib9/XDrawLines/a45.dat
+++ b/xts5/Xlib9/XDrawLines/a45.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a46.dat b/xts5/Xlib9/XDrawLines/a46.dat
index b95f6d74..b95f6d74 100644
--- a/xts5/tset/Xlib9/XDrawLines/a46.dat
+++ b/xts5/Xlib9/XDrawLines/a46.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a47.dat b/xts5/Xlib9/XDrawLines/a47.dat
index 8c7a0d11..8c7a0d11 100644
--- a/xts5/tset/Xlib9/XDrawLines/a47.dat
+++ b/xts5/Xlib9/XDrawLines/a47.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a48.dat b/xts5/Xlib9/XDrawLines/a48.dat
index af29c970..af29c970 100644
--- a/xts5/tset/Xlib9/XDrawLines/a48.dat
+++ b/xts5/Xlib9/XDrawLines/a48.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a49.dat b/xts5/Xlib9/XDrawLines/a49.dat
index 8679f042..8679f042 100644
--- a/xts5/tset/Xlib9/XDrawLines/a49.dat
+++ b/xts5/Xlib9/XDrawLines/a49.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a5.dat b/xts5/Xlib9/XDrawLines/a5.dat
index 8957b869..8957b869 100644
--- a/xts5/tset/Xlib9/XDrawLines/a5.dat
+++ b/xts5/Xlib9/XDrawLines/a5.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a58.dat b/xts5/Xlib9/XDrawLines/a58.dat
index 576cc601..576cc601 100644
--- a/xts5/tset/Xlib9/XDrawLines/a58.dat
+++ b/xts5/Xlib9/XDrawLines/a58.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a60.dat b/xts5/Xlib9/XDrawLines/a60.dat
index 6688aaa1..6688aaa1 100644
--- a/xts5/tset/Xlib9/XDrawLines/a60.dat
+++ b/xts5/Xlib9/XDrawLines/a60.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a62.dat b/xts5/Xlib9/XDrawLines/a62.dat
index bf15b167..bf15b167 100644
--- a/xts5/tset/Xlib9/XDrawLines/a62.dat
+++ b/xts5/Xlib9/XDrawLines/a62.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a67.dat b/xts5/Xlib9/XDrawLines/a67.dat
index 75ef3f46..75ef3f46 100644
--- a/xts5/tset/Xlib9/XDrawLines/a67.dat
+++ b/xts5/Xlib9/XDrawLines/a67.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a7.dat b/xts5/Xlib9/XDrawLines/a7.dat
index 69688551..69688551 100644
--- a/xts5/tset/Xlib9/XDrawLines/a7.dat
+++ b/xts5/Xlib9/XDrawLines/a7.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a70.dat b/xts5/Xlib9/XDrawLines/a70.dat
index 04d85cb1..04d85cb1 100644
--- a/xts5/tset/Xlib9/XDrawLines/a70.dat
+++ b/xts5/Xlib9/XDrawLines/a70.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a71.dat b/xts5/Xlib9/XDrawLines/a71.dat
index 869c05c4..869c05c4 100644
--- a/xts5/tset/Xlib9/XDrawLines/a71.dat
+++ b/xts5/Xlib9/XDrawLines/a71.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a72.dat b/xts5/Xlib9/XDrawLines/a72.dat
index 84b1ef74..84b1ef74 100644
--- a/xts5/tset/Xlib9/XDrawLines/a72.dat
+++ b/xts5/Xlib9/XDrawLines/a72.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a73.dat b/xts5/Xlib9/XDrawLines/a73.dat
index 5d4f8e0a..5d4f8e0a 100644
--- a/xts5/tset/Xlib9/XDrawLines/a73.dat
+++ b/xts5/Xlib9/XDrawLines/a73.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a77.dat b/xts5/Xlib9/XDrawLines/a77.dat
index f1455a34..f1455a34 100644
--- a/xts5/tset/Xlib9/XDrawLines/a77.dat
+++ b/xts5/Xlib9/XDrawLines/a77.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a78.dat b/xts5/Xlib9/XDrawLines/a78.dat
index 9c2b79c3..9c2b79c3 100644
--- a/xts5/tset/Xlib9/XDrawLines/a78.dat
+++ b/xts5/Xlib9/XDrawLines/a78.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a79.dat b/xts5/Xlib9/XDrawLines/a79.dat
index dcab8564..dcab8564 100644
--- a/xts5/tset/Xlib9/XDrawLines/a79.dat
+++ b/xts5/Xlib9/XDrawLines/a79.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a80.dat b/xts5/Xlib9/XDrawLines/a80.dat
index f279cfaa..f279cfaa 100644
--- a/xts5/tset/Xlib9/XDrawLines/a80.dat
+++ b/xts5/Xlib9/XDrawLines/a80.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a81.dat b/xts5/Xlib9/XDrawLines/a81.dat
index 3616f810..3616f810 100644
--- a/xts5/tset/Xlib9/XDrawLines/a81.dat
+++ b/xts5/Xlib9/XDrawLines/a81.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a87.dat b/xts5/Xlib9/XDrawLines/a87.dat
index f38f58b2..f38f58b2 100644
--- a/xts5/tset/Xlib9/XDrawLines/a87.dat
+++ b/xts5/Xlib9/XDrawLines/a87.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a89.dat b/xts5/Xlib9/XDrawLines/a89.dat
index 83ae473f..83ae473f 100644
--- a/xts5/tset/Xlib9/XDrawLines/a89.dat
+++ b/xts5/Xlib9/XDrawLines/a89.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a9.dat b/xts5/Xlib9/XDrawLines/a9.dat
index 7897c7a8..7897c7a8 100644
--- a/xts5/tset/Xlib9/XDrawLines/a9.dat
+++ b/xts5/Xlib9/XDrawLines/a9.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a91.dat b/xts5/Xlib9/XDrawLines/a91.dat
index f8394446..f8394446 100644
--- a/xts5/tset/Xlib9/XDrawLines/a91.dat
+++ b/xts5/Xlib9/XDrawLines/a91.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a93.dat b/xts5/Xlib9/XDrawLines/a93.dat
index 325f686f..325f686f 100644
--- a/xts5/tset/Xlib9/XDrawLines/a93.dat
+++ b/xts5/Xlib9/XDrawLines/a93.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a94.dat b/xts5/Xlib9/XDrawLines/a94.dat
index 9a56e3d4..9a56e3d4 100644
--- a/xts5/tset/Xlib9/XDrawLines/a94.dat
+++ b/xts5/Xlib9/XDrawLines/a94.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a95.dat b/xts5/Xlib9/XDrawLines/a95.dat
index c6f34640..c6f34640 100644
--- a/xts5/tset/Xlib9/XDrawLines/a95.dat
+++ b/xts5/Xlib9/XDrawLines/a95.dat
diff --git a/xts5/tset/Xlib9/XDrawLines/a96.dat b/xts5/Xlib9/XDrawLines/a96.dat
index d973ec1a..d973ec1a 100644
--- a/xts5/tset/Xlib9/XDrawLines/a96.dat
+++ b/xts5/Xlib9/XDrawLines/a96.dat
diff --git a/xts5/tset/Xlib9/XDrawPoint/XDrawPoint.m b/xts5/Xlib9/XDrawPoint/XDrawPoint.m
index fef42bd8..fef42bd8 100644
--- a/xts5/tset/Xlib9/XDrawPoint/XDrawPoint.m
+++ b/xts5/Xlib9/XDrawPoint/XDrawPoint.m
diff --git a/xts5/tset/Xlib9/XDrawPoint/a20.dat b/xts5/Xlib9/XDrawPoint/a20.dat
index fbbab01b..fbbab01b 100644
--- a/xts5/tset/Xlib9/XDrawPoint/a20.dat
+++ b/xts5/Xlib9/XDrawPoint/a20.dat
diff --git a/xts5/tset/Xlib9/XDrawPoint/a25.dat b/xts5/Xlib9/XDrawPoint/a25.dat
index e625eae2..e625eae2 100644
--- a/xts5/tset/Xlib9/XDrawPoint/a25.dat
+++ b/xts5/Xlib9/XDrawPoint/a25.dat
diff --git a/xts5/tset/Xlib9/XDrawPoint/a28.dat b/xts5/Xlib9/XDrawPoint/a28.dat
index 8e6ed3bd..8e6ed3bd 100644
--- a/xts5/tset/Xlib9/XDrawPoint/a28.dat
+++ b/xts5/Xlib9/XDrawPoint/a28.dat
diff --git a/xts5/tset/Xlib9/XDrawPoints/XDrawPoints.m b/xts5/Xlib9/XDrawPoints/XDrawPoints.m
index ab0a26af..ab0a26af 100644
--- a/xts5/tset/Xlib9/XDrawPoints/XDrawPoints.m
+++ b/xts5/Xlib9/XDrawPoints/XDrawPoints.m
diff --git a/xts5/tset/Xlib9/XDrawPoints/a1.dat b/xts5/Xlib9/XDrawPoints/a1.dat
index dd7eac1d..dd7eac1d 100644
--- a/xts5/tset/Xlib9/XDrawPoints/a1.dat
+++ b/xts5/Xlib9/XDrawPoints/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawPoints/a23.dat b/xts5/Xlib9/XDrawPoints/a23.dat
index c1af1d64..c1af1d64 100644
--- a/xts5/tset/Xlib9/XDrawPoints/a23.dat
+++ b/xts5/Xlib9/XDrawPoints/a23.dat
diff --git a/xts5/tset/Xlib9/XDrawPoints/a28.dat b/xts5/Xlib9/XDrawPoints/a28.dat
index 5f4f652e..5f4f652e 100644
--- a/xts5/tset/Xlib9/XDrawPoints/a28.dat
+++ b/xts5/Xlib9/XDrawPoints/a28.dat
diff --git a/xts5/tset/Xlib9/XDrawPoints/a3.dat b/xts5/Xlib9/XDrawPoints/a3.dat
index 5fe8dffc..5fe8dffc 100644
--- a/xts5/tset/Xlib9/XDrawPoints/a3.dat
+++ b/xts5/Xlib9/XDrawPoints/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawPoints/a31.dat b/xts5/Xlib9/XDrawPoints/a31.dat
index 0100ccc3..0100ccc3 100644
--- a/xts5/tset/Xlib9/XDrawPoints/a31.dat
+++ b/xts5/Xlib9/XDrawPoints/a31.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/XDrawRectangle.m b/xts5/Xlib9/XDrawRectangle/XDrawRectangle.m
index 4505dffb..4505dffb 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/XDrawRectangle.m
+++ b/xts5/Xlib9/XDrawRectangle/XDrawRectangle.m
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a1.dat b/xts5/Xlib9/XDrawRectangle/a1.dat
index 5a69be03..5a69be03 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a1.dat
+++ b/xts5/Xlib9/XDrawRectangle/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a23.dat b/xts5/Xlib9/XDrawRectangle/a23.dat
index a3d43dcf..a3d43dcf 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a23.dat
+++ b/xts5/Xlib9/XDrawRectangle/a23.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a31.dat b/xts5/Xlib9/XDrawRectangle/a31.dat
index 5cd4008b..5cd4008b 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a31.dat
+++ b/xts5/Xlib9/XDrawRectangle/a31.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a38.dat b/xts5/Xlib9/XDrawRectangle/a38.dat
index 4d31b572..4d31b572 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a38.dat
+++ b/xts5/Xlib9/XDrawRectangle/a38.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a39.dat b/xts5/Xlib9/XDrawRectangle/a39.dat
index b79f5859..b79f5859 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a39.dat
+++ b/xts5/Xlib9/XDrawRectangle/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a4.dat b/xts5/Xlib9/XDrawRectangle/a4.dat
index 9a4b6eb6..9a4b6eb6 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a4.dat
+++ b/xts5/Xlib9/XDrawRectangle/a4.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a40.dat b/xts5/Xlib9/XDrawRectangle/a40.dat
index 5d770f06..5d770f06 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a40.dat
+++ b/xts5/Xlib9/XDrawRectangle/a40.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a41.dat b/xts5/Xlib9/XDrawRectangle/a41.dat
index eaaa9038..eaaa9038 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a41.dat
+++ b/xts5/Xlib9/XDrawRectangle/a41.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a42.dat b/xts5/Xlib9/XDrawRectangle/a42.dat
index 834d084a..834d084a 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a42.dat
+++ b/xts5/Xlib9/XDrawRectangle/a42.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a43.dat b/xts5/Xlib9/XDrawRectangle/a43.dat
index 1310905a..1310905a 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a43.dat
+++ b/xts5/Xlib9/XDrawRectangle/a43.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a44.dat b/xts5/Xlib9/XDrawRectangle/a44.dat
index 6afbe4c9..6afbe4c9 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a44.dat
+++ b/xts5/Xlib9/XDrawRectangle/a44.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a50.dat b/xts5/Xlib9/XDrawRectangle/a50.dat
index 3cec6768..3cec6768 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a50.dat
+++ b/xts5/Xlib9/XDrawRectangle/a50.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a51.dat b/xts5/Xlib9/XDrawRectangle/a51.dat
index 28e46e1a..28e46e1a 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a51.dat
+++ b/xts5/Xlib9/XDrawRectangle/a51.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a52.dat b/xts5/Xlib9/XDrawRectangle/a52.dat
index 71c16bbf..71c16bbf 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a52.dat
+++ b/xts5/Xlib9/XDrawRectangle/a52.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a53.dat b/xts5/Xlib9/XDrawRectangle/a53.dat
index 76194133..76194133 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a53.dat
+++ b/xts5/Xlib9/XDrawRectangle/a53.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a54.dat b/xts5/Xlib9/XDrawRectangle/a54.dat
index 9ac7daa2..9ac7daa2 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a54.dat
+++ b/xts5/Xlib9/XDrawRectangle/a54.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a57.dat b/xts5/Xlib9/XDrawRectangle/a57.dat
index ff2e646e..ff2e646e 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a57.dat
+++ b/xts5/Xlib9/XDrawRectangle/a57.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a58.dat b/xts5/Xlib9/XDrawRectangle/a58.dat
index 26ae939b..26ae939b 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a58.dat
+++ b/xts5/Xlib9/XDrawRectangle/a58.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a59.dat b/xts5/Xlib9/XDrawRectangle/a59.dat
index c26fbad7..c26fbad7 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a59.dat
+++ b/xts5/Xlib9/XDrawRectangle/a59.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a60.dat b/xts5/Xlib9/XDrawRectangle/a60.dat
index b1551950..b1551950 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a60.dat
+++ b/xts5/Xlib9/XDrawRectangle/a60.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a64.dat b/xts5/Xlib9/XDrawRectangle/a64.dat
index be503a81..be503a81 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a64.dat
+++ b/xts5/Xlib9/XDrawRectangle/a64.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a67.dat b/xts5/Xlib9/XDrawRectangle/a67.dat
index 1eb362e2..1eb362e2 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a67.dat
+++ b/xts5/Xlib9/XDrawRectangle/a67.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a69.dat b/xts5/Xlib9/XDrawRectangle/a69.dat
index b121b4a0..b121b4a0 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a69.dat
+++ b/xts5/Xlib9/XDrawRectangle/a69.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a71.dat b/xts5/Xlib9/XDrawRectangle/a71.dat
index 8ec7f87d..8ec7f87d 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a71.dat
+++ b/xts5/Xlib9/XDrawRectangle/a71.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a73.dat b/xts5/Xlib9/XDrawRectangle/a73.dat
index 7c8ceb59..7c8ceb59 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a73.dat
+++ b/xts5/Xlib9/XDrawRectangle/a73.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a74.dat b/xts5/Xlib9/XDrawRectangle/a74.dat
index 8adb495c..8adb495c 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a74.dat
+++ b/xts5/Xlib9/XDrawRectangle/a74.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a75.dat b/xts5/Xlib9/XDrawRectangle/a75.dat
index 466b20ef..466b20ef 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a75.dat
+++ b/xts5/Xlib9/XDrawRectangle/a75.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangle/a76.dat b/xts5/Xlib9/XDrawRectangle/a76.dat
index c5cd22a9..c5cd22a9 100644
--- a/xts5/tset/Xlib9/XDrawRectangle/a76.dat
+++ b/xts5/Xlib9/XDrawRectangle/a76.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/XDrawRectangles.m b/xts5/Xlib9/XDrawRectangles/XDrawRectangles.m
index 248367fb..248367fb 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/XDrawRectangles.m
+++ b/xts5/Xlib9/XDrawRectangles/XDrawRectangles.m
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a1.dat b/xts5/Xlib9/XDrawRectangles/a1.dat
index fe8e124c..fe8e124c 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a1.dat
+++ b/xts5/Xlib9/XDrawRectangles/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a25.dat b/xts5/Xlib9/XDrawRectangles/a25.dat
index 0e3ba96d..0e3ba96d 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a25.dat
+++ b/xts5/Xlib9/XDrawRectangles/a25.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a33.dat b/xts5/Xlib9/XDrawRectangles/a33.dat
index eb49485e..eb49485e 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a33.dat
+++ b/xts5/Xlib9/XDrawRectangles/a33.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a40.dat b/xts5/Xlib9/XDrawRectangles/a40.dat
index 92592bc2..92592bc2 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a40.dat
+++ b/xts5/Xlib9/XDrawRectangles/a40.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a41.dat b/xts5/Xlib9/XDrawRectangles/a41.dat
index 7af8bcd4..7af8bcd4 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a41.dat
+++ b/xts5/Xlib9/XDrawRectangles/a41.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a42.dat b/xts5/Xlib9/XDrawRectangles/a42.dat
index 094a00f5..094a00f5 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a42.dat
+++ b/xts5/Xlib9/XDrawRectangles/a42.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a43.dat b/xts5/Xlib9/XDrawRectangles/a43.dat
index 1606bdcc..1606bdcc 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a43.dat
+++ b/xts5/Xlib9/XDrawRectangles/a43.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a44.dat b/xts5/Xlib9/XDrawRectangles/a44.dat
index afa75bb2..afa75bb2 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a44.dat
+++ b/xts5/Xlib9/XDrawRectangles/a44.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a45.dat b/xts5/Xlib9/XDrawRectangles/a45.dat
index 733fe1eb..733fe1eb 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a45.dat
+++ b/xts5/Xlib9/XDrawRectangles/a45.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a46.dat b/xts5/Xlib9/XDrawRectangles/a46.dat
index a6d069fb..a6d069fb 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a46.dat
+++ b/xts5/Xlib9/XDrawRectangles/a46.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a5.dat b/xts5/Xlib9/XDrawRectangles/a5.dat
index 3e1a1322..3e1a1322 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a5.dat
+++ b/xts5/Xlib9/XDrawRectangles/a5.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a52.dat b/xts5/Xlib9/XDrawRectangles/a52.dat
index b851e526..b851e526 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a52.dat
+++ b/xts5/Xlib9/XDrawRectangles/a52.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a53.dat b/xts5/Xlib9/XDrawRectangles/a53.dat
index bcddb2b8..bcddb2b8 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a53.dat
+++ b/xts5/Xlib9/XDrawRectangles/a53.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a54.dat b/xts5/Xlib9/XDrawRectangles/a54.dat
index fb49beb8..fb49beb8 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a54.dat
+++ b/xts5/Xlib9/XDrawRectangles/a54.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a55.dat b/xts5/Xlib9/XDrawRectangles/a55.dat
index 0f6ede27..0f6ede27 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a55.dat
+++ b/xts5/Xlib9/XDrawRectangles/a55.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a56.dat b/xts5/Xlib9/XDrawRectangles/a56.dat
index ac3b59f7..ac3b59f7 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a56.dat
+++ b/xts5/Xlib9/XDrawRectangles/a56.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a59.dat b/xts5/Xlib9/XDrawRectangles/a59.dat
index 497a7247..497a7247 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a59.dat
+++ b/xts5/Xlib9/XDrawRectangles/a59.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a6.dat b/xts5/Xlib9/XDrawRectangles/a6.dat
index b94b0cb7..b94b0cb7 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a6.dat
+++ b/xts5/Xlib9/XDrawRectangles/a6.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a60.dat b/xts5/Xlib9/XDrawRectangles/a60.dat
index 42dae1cb..42dae1cb 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a60.dat
+++ b/xts5/Xlib9/XDrawRectangles/a60.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a61.dat b/xts5/Xlib9/XDrawRectangles/a61.dat
index d515e62f..d515e62f 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a61.dat
+++ b/xts5/Xlib9/XDrawRectangles/a61.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a62.dat b/xts5/Xlib9/XDrawRectangles/a62.dat
index 11153eb0..11153eb0 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a62.dat
+++ b/xts5/Xlib9/XDrawRectangles/a62.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a66.dat b/xts5/Xlib9/XDrawRectangles/a66.dat
index 4481cd7d..4481cd7d 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a66.dat
+++ b/xts5/Xlib9/XDrawRectangles/a66.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a69.dat b/xts5/Xlib9/XDrawRectangles/a69.dat
index 96f052c1..96f052c1 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a69.dat
+++ b/xts5/Xlib9/XDrawRectangles/a69.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a71.dat b/xts5/Xlib9/XDrawRectangles/a71.dat
index e45517b3..e45517b3 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a71.dat
+++ b/xts5/Xlib9/XDrawRectangles/a71.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a73.dat b/xts5/Xlib9/XDrawRectangles/a73.dat
index 6e1eb8b6..6e1eb8b6 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a73.dat
+++ b/xts5/Xlib9/XDrawRectangles/a73.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a75.dat b/xts5/Xlib9/XDrawRectangles/a75.dat
index 850e7c7a..850e7c7a 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a75.dat
+++ b/xts5/Xlib9/XDrawRectangles/a75.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a76.dat b/xts5/Xlib9/XDrawRectangles/a76.dat
index 7d2fd3bb..7d2fd3bb 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a76.dat
+++ b/xts5/Xlib9/XDrawRectangles/a76.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a77.dat b/xts5/Xlib9/XDrawRectangles/a77.dat
index 3a341d4b..3a341d4b 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a77.dat
+++ b/xts5/Xlib9/XDrawRectangles/a77.dat
diff --git a/xts5/tset/Xlib9/XDrawRectangles/a78.dat b/xts5/Xlib9/XDrawRectangles/a78.dat
index 82698230..82698230 100644
--- a/xts5/tset/Xlib9/XDrawRectangles/a78.dat
+++ b/xts5/Xlib9/XDrawRectangles/a78.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/XDrawSegments.m b/xts5/Xlib9/XDrawSegments/XDrawSegments.m
index 15893776..15893776 100644
--- a/xts5/tset/Xlib9/XDrawSegments/XDrawSegments.m
+++ b/xts5/Xlib9/XDrawSegments/XDrawSegments.m
diff --git a/xts5/tset/Xlib9/XDrawSegments/a1.dat b/xts5/Xlib9/XDrawSegments/a1.dat
index a295cb2a..a295cb2a 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a1.dat
+++ b/xts5/Xlib9/XDrawSegments/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a24.dat b/xts5/Xlib9/XDrawSegments/a24.dat
index 17b0e29d..17b0e29d 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a24.dat
+++ b/xts5/Xlib9/XDrawSegments/a24.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a3.dat b/xts5/Xlib9/XDrawSegments/a3.dat
index c16688ee..c16688ee 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a3.dat
+++ b/xts5/Xlib9/XDrawSegments/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a32.dat b/xts5/Xlib9/XDrawSegments/a32.dat
index a3b53bcf..a3b53bcf 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a32.dat
+++ b/xts5/Xlib9/XDrawSegments/a32.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a39.dat b/xts5/Xlib9/XDrawSegments/a39.dat
index 0bbf9296..0bbf9296 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a39.dat
+++ b/xts5/Xlib9/XDrawSegments/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a4.dat b/xts5/Xlib9/XDrawSegments/a4.dat
index 572a3531..572a3531 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a4.dat
+++ b/xts5/Xlib9/XDrawSegments/a4.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a40.dat b/xts5/Xlib9/XDrawSegments/a40.dat
index be880320..be880320 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a40.dat
+++ b/xts5/Xlib9/XDrawSegments/a40.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a41.dat b/xts5/Xlib9/XDrawSegments/a41.dat
index 2d1dfac8..2d1dfac8 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a41.dat
+++ b/xts5/Xlib9/XDrawSegments/a41.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a42.dat b/xts5/Xlib9/XDrawSegments/a42.dat
index db3c8cc9..db3c8cc9 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a42.dat
+++ b/xts5/Xlib9/XDrawSegments/a42.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a43.dat b/xts5/Xlib9/XDrawSegments/a43.dat
index ad0a446b..ad0a446b 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a43.dat
+++ b/xts5/Xlib9/XDrawSegments/a43.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a44.dat b/xts5/Xlib9/XDrawSegments/a44.dat
index 4909810b..4909810b 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a44.dat
+++ b/xts5/Xlib9/XDrawSegments/a44.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a45.dat b/xts5/Xlib9/XDrawSegments/a45.dat
index 7103cd30..7103cd30 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a45.dat
+++ b/xts5/Xlib9/XDrawSegments/a45.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a5.dat b/xts5/Xlib9/XDrawSegments/a5.dat
index 932ca92a..932ca92a 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a5.dat
+++ b/xts5/Xlib9/XDrawSegments/a5.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a54.dat b/xts5/Xlib9/XDrawSegments/a54.dat
index 67592ea6..67592ea6 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a54.dat
+++ b/xts5/Xlib9/XDrawSegments/a54.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a56.dat b/xts5/Xlib9/XDrawSegments/a56.dat
index 5bc39912..5bc39912 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a56.dat
+++ b/xts5/Xlib9/XDrawSegments/a56.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a58.dat b/xts5/Xlib9/XDrawSegments/a58.dat
index ae25a010..ae25a010 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a58.dat
+++ b/xts5/Xlib9/XDrawSegments/a58.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a63.dat b/xts5/Xlib9/XDrawSegments/a63.dat
index bbe6fd03..bbe6fd03 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a63.dat
+++ b/xts5/Xlib9/XDrawSegments/a63.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a66.dat b/xts5/Xlib9/XDrawSegments/a66.dat
index a447d12e..a447d12e 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a66.dat
+++ b/xts5/Xlib9/XDrawSegments/a66.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a67.dat b/xts5/Xlib9/XDrawSegments/a67.dat
index 32640bb3..32640bb3 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a67.dat
+++ b/xts5/Xlib9/XDrawSegments/a67.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a68.dat b/xts5/Xlib9/XDrawSegments/a68.dat
index 16686f91..16686f91 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a68.dat
+++ b/xts5/Xlib9/XDrawSegments/a68.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a69.dat b/xts5/Xlib9/XDrawSegments/a69.dat
index b7f8c8a1..b7f8c8a1 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a69.dat
+++ b/xts5/Xlib9/XDrawSegments/a69.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a73.dat b/xts5/Xlib9/XDrawSegments/a73.dat
index 6fe4b516..6fe4b516 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a73.dat
+++ b/xts5/Xlib9/XDrawSegments/a73.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a76.dat b/xts5/Xlib9/XDrawSegments/a76.dat
index b4e161d5..b4e161d5 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a76.dat
+++ b/xts5/Xlib9/XDrawSegments/a76.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a78.dat b/xts5/Xlib9/XDrawSegments/a78.dat
index 251587c4..251587c4 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a78.dat
+++ b/xts5/Xlib9/XDrawSegments/a78.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a80.dat b/xts5/Xlib9/XDrawSegments/a80.dat
index 9bec0aa5..9bec0aa5 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a80.dat
+++ b/xts5/Xlib9/XDrawSegments/a80.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a82.dat b/xts5/Xlib9/XDrawSegments/a82.dat
index 1cae7559..1cae7559 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a82.dat
+++ b/xts5/Xlib9/XDrawSegments/a82.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a83.dat b/xts5/Xlib9/XDrawSegments/a83.dat
index 8b3e261e..8b3e261e 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a83.dat
+++ b/xts5/Xlib9/XDrawSegments/a83.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a84.dat b/xts5/Xlib9/XDrawSegments/a84.dat
index 36edcdfc..36edcdfc 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a84.dat
+++ b/xts5/Xlib9/XDrawSegments/a84.dat
diff --git a/xts5/tset/Xlib9/XDrawSegments/a85.dat b/xts5/Xlib9/XDrawSegments/a85.dat
index 0b1efb3f..0b1efb3f 100644
--- a/xts5/tset/Xlib9/XDrawSegments/a85.dat
+++ b/xts5/Xlib9/XDrawSegments/a85.dat
diff --git a/xts5/tset/Xlib9/XDrawString/XDrawString.m b/xts5/Xlib9/XDrawString/XDrawString.m
index 6f3cbfd4..6f3cbfd4 100644
--- a/xts5/tset/Xlib9/XDrawString/XDrawString.m
+++ b/xts5/Xlib9/XDrawString/XDrawString.m
diff --git a/xts5/tset/Xlib9/XDrawString/a1.dat b/xts5/Xlib9/XDrawString/a1.dat
index 78309591..78309591 100644
--- a/xts5/tset/Xlib9/XDrawString/a1.dat
+++ b/xts5/Xlib9/XDrawString/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a23.dat b/xts5/Xlib9/XDrawString/a23.dat
index 3f48835c..3f48835c 100644
--- a/xts5/tset/Xlib9/XDrawString/a23.dat
+++ b/xts5/Xlib9/XDrawString/a23.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a24.dat b/xts5/Xlib9/XDrawString/a24.dat
index 064b2509..064b2509 100644
--- a/xts5/tset/Xlib9/XDrawString/a24.dat
+++ b/xts5/Xlib9/XDrawString/a24.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a25.dat b/xts5/Xlib9/XDrawString/a25.dat
index 20d5b4a0..20d5b4a0 100644
--- a/xts5/tset/Xlib9/XDrawString/a25.dat
+++ b/xts5/Xlib9/XDrawString/a25.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a26.dat b/xts5/Xlib9/XDrawString/a26.dat
index af643910..af643910 100644
--- a/xts5/tset/Xlib9/XDrawString/a26.dat
+++ b/xts5/Xlib9/XDrawString/a26.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a3.dat b/xts5/Xlib9/XDrawString/a3.dat
index 8abfbb3e..8abfbb3e 100644
--- a/xts5/tset/Xlib9/XDrawString/a3.dat
+++ b/xts5/Xlib9/XDrawString/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a30.dat b/xts5/Xlib9/XDrawString/a30.dat
index cead399f..cead399f 100644
--- a/xts5/tset/Xlib9/XDrawString/a30.dat
+++ b/xts5/Xlib9/XDrawString/a30.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a33.dat b/xts5/Xlib9/XDrawString/a33.dat
index 376c4125..376c4125 100644
--- a/xts5/tset/Xlib9/XDrawString/a33.dat
+++ b/xts5/Xlib9/XDrawString/a33.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a35.dat b/xts5/Xlib9/XDrawString/a35.dat
index defeb98f..defeb98f 100644
--- a/xts5/tset/Xlib9/XDrawString/a35.dat
+++ b/xts5/Xlib9/XDrawString/a35.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a37.dat b/xts5/Xlib9/XDrawString/a37.dat
index 2ec353bf..2ec353bf 100644
--- a/xts5/tset/Xlib9/XDrawString/a37.dat
+++ b/xts5/Xlib9/XDrawString/a37.dat
diff --git a/xts5/tset/Xlib9/XDrawString/a39.dat b/xts5/Xlib9/XDrawString/a39.dat
index 9b4dd5a1..9b4dd5a1 100644
--- a/xts5/tset/Xlib9/XDrawString/a39.dat
+++ b/xts5/Xlib9/XDrawString/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/XDrawString16.m b/xts5/Xlib9/XDrawString16/XDrawString16.m
index 1b36d461..1b36d461 100644
--- a/xts5/tset/Xlib9/XDrawString16/XDrawString16.m
+++ b/xts5/Xlib9/XDrawString16/XDrawString16.m
diff --git a/xts5/tset/Xlib9/XDrawString16/a1.dat b/xts5/Xlib9/XDrawString16/a1.dat
index 731d8f10..731d8f10 100644
--- a/xts5/tset/Xlib9/XDrawString16/a1.dat
+++ b/xts5/Xlib9/XDrawString16/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a23.dat b/xts5/Xlib9/XDrawString16/a23.dat
index e09e6843..e09e6843 100644
--- a/xts5/tset/Xlib9/XDrawString16/a23.dat
+++ b/xts5/Xlib9/XDrawString16/a23.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a24.dat b/xts5/Xlib9/XDrawString16/a24.dat
index 3cfe61a2..3cfe61a2 100644
--- a/xts5/tset/Xlib9/XDrawString16/a24.dat
+++ b/xts5/Xlib9/XDrawString16/a24.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a25.dat b/xts5/Xlib9/XDrawString16/a25.dat
index 92e97967..92e97967 100644
--- a/xts5/tset/Xlib9/XDrawString16/a25.dat
+++ b/xts5/Xlib9/XDrawString16/a25.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a26.dat b/xts5/Xlib9/XDrawString16/a26.dat
index d3afe439..d3afe439 100644
--- a/xts5/tset/Xlib9/XDrawString16/a26.dat
+++ b/xts5/Xlib9/XDrawString16/a26.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a3.dat b/xts5/Xlib9/XDrawString16/a3.dat
index 3060eb22..3060eb22 100644
--- a/xts5/tset/Xlib9/XDrawString16/a3.dat
+++ b/xts5/Xlib9/XDrawString16/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a30.dat b/xts5/Xlib9/XDrawString16/a30.dat
index 58c7f7c7..58c7f7c7 100644
--- a/xts5/tset/Xlib9/XDrawString16/a30.dat
+++ b/xts5/Xlib9/XDrawString16/a30.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a33.dat b/xts5/Xlib9/XDrawString16/a33.dat
index d130e78f..d130e78f 100644
--- a/xts5/tset/Xlib9/XDrawString16/a33.dat
+++ b/xts5/Xlib9/XDrawString16/a33.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a35.dat b/xts5/Xlib9/XDrawString16/a35.dat
index c14ac51e..c14ac51e 100644
--- a/xts5/tset/Xlib9/XDrawString16/a35.dat
+++ b/xts5/Xlib9/XDrawString16/a35.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a37.dat b/xts5/Xlib9/XDrawString16/a37.dat
index 77d8a8d7..77d8a8d7 100644
--- a/xts5/tset/Xlib9/XDrawString16/a37.dat
+++ b/xts5/Xlib9/XDrawString16/a37.dat
diff --git a/xts5/tset/Xlib9/XDrawString16/a39.dat b/xts5/Xlib9/XDrawString16/a39.dat
index e97f1d65..e97f1d65 100644
--- a/xts5/tset/Xlib9/XDrawString16/a39.dat
+++ b/xts5/Xlib9/XDrawString16/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawText/XDrawText.m b/xts5/Xlib9/XDrawText/XDrawText.m
index 27078f42..27078f42 100644
--- a/xts5/tset/Xlib9/XDrawText/XDrawText.m
+++ b/xts5/Xlib9/XDrawText/XDrawText.m
diff --git a/xts5/tset/Xlib9/XDrawText/a1.dat b/xts5/Xlib9/XDrawText/a1.dat
index 7fc46492..7fc46492 100644
--- a/xts5/tset/Xlib9/XDrawText/a1.dat
+++ b/xts5/Xlib9/XDrawText/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a27.dat b/xts5/Xlib9/XDrawText/a27.dat
index 305ee4dd..305ee4dd 100644
--- a/xts5/tset/Xlib9/XDrawText/a27.dat
+++ b/xts5/Xlib9/XDrawText/a27.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a28.dat b/xts5/Xlib9/XDrawText/a28.dat
index cff0336f..cff0336f 100644
--- a/xts5/tset/Xlib9/XDrawText/a28.dat
+++ b/xts5/Xlib9/XDrawText/a28.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a29.dat b/xts5/Xlib9/XDrawText/a29.dat
index 1977b418..1977b418 100644
--- a/xts5/tset/Xlib9/XDrawText/a29.dat
+++ b/xts5/Xlib9/XDrawText/a29.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a3.dat b/xts5/Xlib9/XDrawText/a3.dat
index dfbc7493..dfbc7493 100644
--- a/xts5/tset/Xlib9/XDrawText/a3.dat
+++ b/xts5/Xlib9/XDrawText/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a30.dat b/xts5/Xlib9/XDrawText/a30.dat
index 48de767f..48de767f 100644
--- a/xts5/tset/Xlib9/XDrawText/a30.dat
+++ b/xts5/Xlib9/XDrawText/a30.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a34.dat b/xts5/Xlib9/XDrawText/a34.dat
index 44088663..44088663 100644
--- a/xts5/tset/Xlib9/XDrawText/a34.dat
+++ b/xts5/Xlib9/XDrawText/a34.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a37.dat b/xts5/Xlib9/XDrawText/a37.dat
index a8f15661..a8f15661 100644
--- a/xts5/tset/Xlib9/XDrawText/a37.dat
+++ b/xts5/Xlib9/XDrawText/a37.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a39.dat b/xts5/Xlib9/XDrawText/a39.dat
index bf2df99c..bf2df99c 100644
--- a/xts5/tset/Xlib9/XDrawText/a39.dat
+++ b/xts5/Xlib9/XDrawText/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a41.dat b/xts5/Xlib9/XDrawText/a41.dat
index c4830af0..c4830af0 100644
--- a/xts5/tset/Xlib9/XDrawText/a41.dat
+++ b/xts5/Xlib9/XDrawText/a41.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a43.dat b/xts5/Xlib9/XDrawText/a43.dat
index 95a41417..95a41417 100644
--- a/xts5/tset/Xlib9/XDrawText/a43.dat
+++ b/xts5/Xlib9/XDrawText/a43.dat
diff --git a/xts5/tset/Xlib9/XDrawText/a5.dat b/xts5/Xlib9/XDrawText/a5.dat
index 83eac7b9..83eac7b9 100644
--- a/xts5/tset/Xlib9/XDrawText/a5.dat
+++ b/xts5/Xlib9/XDrawText/a5.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/XDrawText16.m b/xts5/Xlib9/XDrawText16/XDrawText16.m
index e5690a0c..e5690a0c 100644
--- a/xts5/tset/Xlib9/XDrawText16/XDrawText16.m
+++ b/xts5/Xlib9/XDrawText16/XDrawText16.m
diff --git a/xts5/tset/Xlib9/XDrawText16/a1.dat b/xts5/Xlib9/XDrawText16/a1.dat
index 811230c7..811230c7 100644
--- a/xts5/tset/Xlib9/XDrawText16/a1.dat
+++ b/xts5/Xlib9/XDrawText16/a1.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a27.dat b/xts5/Xlib9/XDrawText16/a27.dat
index f8c8db83..f8c8db83 100644
--- a/xts5/tset/Xlib9/XDrawText16/a27.dat
+++ b/xts5/Xlib9/XDrawText16/a27.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a28.dat b/xts5/Xlib9/XDrawText16/a28.dat
index 4805ab4c..4805ab4c 100644
--- a/xts5/tset/Xlib9/XDrawText16/a28.dat
+++ b/xts5/Xlib9/XDrawText16/a28.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a29.dat b/xts5/Xlib9/XDrawText16/a29.dat
index 38f1c9fa..38f1c9fa 100644
--- a/xts5/tset/Xlib9/XDrawText16/a29.dat
+++ b/xts5/Xlib9/XDrawText16/a29.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a3.dat b/xts5/Xlib9/XDrawText16/a3.dat
index 181140ab..181140ab 100644
--- a/xts5/tset/Xlib9/XDrawText16/a3.dat
+++ b/xts5/Xlib9/XDrawText16/a3.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a30.dat b/xts5/Xlib9/XDrawText16/a30.dat
index 0cf90e36..0cf90e36 100644
--- a/xts5/tset/Xlib9/XDrawText16/a30.dat
+++ b/xts5/Xlib9/XDrawText16/a30.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a34.dat b/xts5/Xlib9/XDrawText16/a34.dat
index 3e053672..3e053672 100644
--- a/xts5/tset/Xlib9/XDrawText16/a34.dat
+++ b/xts5/Xlib9/XDrawText16/a34.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a37.dat b/xts5/Xlib9/XDrawText16/a37.dat
index 218ccf16..218ccf16 100644
--- a/xts5/tset/Xlib9/XDrawText16/a37.dat
+++ b/xts5/Xlib9/XDrawText16/a37.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a39.dat b/xts5/Xlib9/XDrawText16/a39.dat
index d0499ae1..d0499ae1 100644
--- a/xts5/tset/Xlib9/XDrawText16/a39.dat
+++ b/xts5/Xlib9/XDrawText16/a39.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a4.dat b/xts5/Xlib9/XDrawText16/a4.dat
index 26c8cb36..26c8cb36 100644
--- a/xts5/tset/Xlib9/XDrawText16/a4.dat
+++ b/xts5/Xlib9/XDrawText16/a4.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a41.dat b/xts5/Xlib9/XDrawText16/a41.dat
index 0bdbb9c9..0bdbb9c9 100644
--- a/xts5/tset/Xlib9/XDrawText16/a41.dat
+++ b/xts5/Xlib9/XDrawText16/a41.dat
diff --git a/xts5/tset/Xlib9/XDrawText16/a43.dat b/xts5/Xlib9/XDrawText16/a43.dat
index 77d476ae..77d476ae 100644
--- a/xts5/tset/Xlib9/XDrawText16/a43.dat
+++ b/xts5/Xlib9/XDrawText16/a43.dat
diff --git a/xts5/tset/Xlib9/XFillArc/XFillArc.m b/xts5/Xlib9/XFillArc/XFillArc.m
index 7e7aa891..7e7aa891 100644
--- a/xts5/tset/Xlib9/XFillArc/XFillArc.m
+++ b/xts5/Xlib9/XFillArc/XFillArc.m
diff --git a/xts5/tset/Xlib9/XFillArc/a1.dat b/xts5/Xlib9/XFillArc/a1.dat
index 1e20448a..1e20448a 100644
--- a/xts5/tset/Xlib9/XFillArc/a1.dat
+++ b/xts5/Xlib9/XFillArc/a1.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a2.dat b/xts5/Xlib9/XFillArc/a2.dat
index 67318e64..67318e64 100644
--- a/xts5/tset/Xlib9/XFillArc/a2.dat
+++ b/xts5/Xlib9/XFillArc/a2.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a23.dat b/xts5/Xlib9/XFillArc/a23.dat
index 7c2e341b..7c2e341b 100644
--- a/xts5/tset/Xlib9/XFillArc/a23.dat
+++ b/xts5/Xlib9/XFillArc/a23.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a24.dat b/xts5/Xlib9/XFillArc/a24.dat
index b0a749be..b0a749be 100644
--- a/xts5/tset/Xlib9/XFillArc/a24.dat
+++ b/xts5/Xlib9/XFillArc/a24.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a25.dat b/xts5/Xlib9/XFillArc/a25.dat
index 02549054..02549054 100644
--- a/xts5/tset/Xlib9/XFillArc/a25.dat
+++ b/xts5/Xlib9/XFillArc/a25.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a26.dat b/xts5/Xlib9/XFillArc/a26.dat
index 838c4bb1..838c4bb1 100644
--- a/xts5/tset/Xlib9/XFillArc/a26.dat
+++ b/xts5/Xlib9/XFillArc/a26.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a3.dat b/xts5/Xlib9/XFillArc/a3.dat
index 0ccd71fe..0ccd71fe 100644
--- a/xts5/tset/Xlib9/XFillArc/a3.dat
+++ b/xts5/Xlib9/XFillArc/a3.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a30.dat b/xts5/Xlib9/XFillArc/a30.dat
index b1da4955..b1da4955 100644
--- a/xts5/tset/Xlib9/XFillArc/a30.dat
+++ b/xts5/Xlib9/XFillArc/a30.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a33.dat b/xts5/Xlib9/XFillArc/a33.dat
index 166e0317..166e0317 100644
--- a/xts5/tset/Xlib9/XFillArc/a33.dat
+++ b/xts5/Xlib9/XFillArc/a33.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a35.dat b/xts5/Xlib9/XFillArc/a35.dat
index 6e8e14fe..6e8e14fe 100644
--- a/xts5/tset/Xlib9/XFillArc/a35.dat
+++ b/xts5/Xlib9/XFillArc/a35.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a37.dat b/xts5/Xlib9/XFillArc/a37.dat
index ae52269c..ae52269c 100644
--- a/xts5/tset/Xlib9/XFillArc/a37.dat
+++ b/xts5/Xlib9/XFillArc/a37.dat
diff --git a/xts5/tset/Xlib9/XFillArc/a39.dat b/xts5/Xlib9/XFillArc/a39.dat
index 8d211081..8d211081 100644
--- a/xts5/tset/Xlib9/XFillArc/a39.dat
+++ b/xts5/Xlib9/XFillArc/a39.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/XFillArcs.m b/xts5/Xlib9/XFillArcs/XFillArcs.m
index 0e734726..0e734726 100644
--- a/xts5/tset/Xlib9/XFillArcs/XFillArcs.m
+++ b/xts5/Xlib9/XFillArcs/XFillArcs.m
diff --git a/xts5/tset/Xlib9/XFillArcs/a1.dat b/xts5/Xlib9/XFillArcs/a1.dat
index aa615ba2..aa615ba2 100644
--- a/xts5/tset/Xlib9/XFillArcs/a1.dat
+++ b/xts5/Xlib9/XFillArcs/a1.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a2.dat b/xts5/Xlib9/XFillArcs/a2.dat
index 13ee7001..13ee7001 100644
--- a/xts5/tset/Xlib9/XFillArcs/a2.dat
+++ b/xts5/Xlib9/XFillArcs/a2.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a25.dat b/xts5/Xlib9/XFillArcs/a25.dat
index de8a8259..de8a8259 100644
--- a/xts5/tset/Xlib9/XFillArcs/a25.dat
+++ b/xts5/Xlib9/XFillArcs/a25.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a26.dat b/xts5/Xlib9/XFillArcs/a26.dat
index 14c0bbc8..14c0bbc8 100644
--- a/xts5/tset/Xlib9/XFillArcs/a26.dat
+++ b/xts5/Xlib9/XFillArcs/a26.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a27.dat b/xts5/Xlib9/XFillArcs/a27.dat
index 7bfc8302..7bfc8302 100644
--- a/xts5/tset/Xlib9/XFillArcs/a27.dat
+++ b/xts5/Xlib9/XFillArcs/a27.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a28.dat b/xts5/Xlib9/XFillArcs/a28.dat
index b0275ce7..b0275ce7 100644
--- a/xts5/tset/Xlib9/XFillArcs/a28.dat
+++ b/xts5/Xlib9/XFillArcs/a28.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a3.dat b/xts5/Xlib9/XFillArcs/a3.dat
index 71c566f7..71c566f7 100644
--- a/xts5/tset/Xlib9/XFillArcs/a3.dat
+++ b/xts5/Xlib9/XFillArcs/a3.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a32.dat b/xts5/Xlib9/XFillArcs/a32.dat
index b242d247..b242d247 100644
--- a/xts5/tset/Xlib9/XFillArcs/a32.dat
+++ b/xts5/Xlib9/XFillArcs/a32.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a35.dat b/xts5/Xlib9/XFillArcs/a35.dat
index 2249d86c..2249d86c 100644
--- a/xts5/tset/Xlib9/XFillArcs/a35.dat
+++ b/xts5/Xlib9/XFillArcs/a35.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a37.dat b/xts5/Xlib9/XFillArcs/a37.dat
index d704034e..d704034e 100644
--- a/xts5/tset/Xlib9/XFillArcs/a37.dat
+++ b/xts5/Xlib9/XFillArcs/a37.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a39.dat b/xts5/Xlib9/XFillArcs/a39.dat
index 5514b700..5514b700 100644
--- a/xts5/tset/Xlib9/XFillArcs/a39.dat
+++ b/xts5/Xlib9/XFillArcs/a39.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a41.dat b/xts5/Xlib9/XFillArcs/a41.dat
index bad776a5..bad776a5 100644
--- a/xts5/tset/Xlib9/XFillArcs/a41.dat
+++ b/xts5/Xlib9/XFillArcs/a41.dat
diff --git a/xts5/tset/Xlib9/XFillArcs/a6.dat b/xts5/Xlib9/XFillArcs/a6.dat
index afcb63b5..afcb63b5 100644
--- a/xts5/tset/Xlib9/XFillArcs/a6.dat
+++ b/xts5/Xlib9/XFillArcs/a6.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/XFillPolygon.m b/xts5/Xlib9/XFillPolygon/XFillPolygon.m
index c89b61d7..c89b61d7 100644
--- a/xts5/tset/Xlib9/XFillPolygon/XFillPolygon.m
+++ b/xts5/Xlib9/XFillPolygon/XFillPolygon.m
diff --git a/xts5/tset/Xlib9/XFillPolygon/a1.dat b/xts5/Xlib9/XFillPolygon/a1.dat
index 315d49ee..315d49ee 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a1.dat
+++ b/xts5/Xlib9/XFillPolygon/a1.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a28.dat b/xts5/Xlib9/XFillPolygon/a28.dat
index 203ad9a8..203ad9a8 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a28.dat
+++ b/xts5/Xlib9/XFillPolygon/a28.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a29.dat b/xts5/Xlib9/XFillPolygon/a29.dat
index 1a2422a8..1a2422a8 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a29.dat
+++ b/xts5/Xlib9/XFillPolygon/a29.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a30.dat b/xts5/Xlib9/XFillPolygon/a30.dat
index ab641b00..ab641b00 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a30.dat
+++ b/xts5/Xlib9/XFillPolygon/a30.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a31.dat b/xts5/Xlib9/XFillPolygon/a31.dat
index 321a759d..321a759d 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a31.dat
+++ b/xts5/Xlib9/XFillPolygon/a31.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a35.dat b/xts5/Xlib9/XFillPolygon/a35.dat
index f88c027b..f88c027b 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a35.dat
+++ b/xts5/Xlib9/XFillPolygon/a35.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a38.dat b/xts5/Xlib9/XFillPolygon/a38.dat
index f6f76800..f6f76800 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a38.dat
+++ b/xts5/Xlib9/XFillPolygon/a38.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a40.dat b/xts5/Xlib9/XFillPolygon/a40.dat
index db543a9e..db543a9e 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a40.dat
+++ b/xts5/Xlib9/XFillPolygon/a40.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a42.dat b/xts5/Xlib9/XFillPolygon/a42.dat
index 5e401655..5e401655 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a42.dat
+++ b/xts5/Xlib9/XFillPolygon/a42.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a44.dat b/xts5/Xlib9/XFillPolygon/a44.dat
index bbc58fb2..bbc58fb2 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a44.dat
+++ b/xts5/Xlib9/XFillPolygon/a44.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a45.dat b/xts5/Xlib9/XFillPolygon/a45.dat
index 65607078..65607078 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a45.dat
+++ b/xts5/Xlib9/XFillPolygon/a45.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a46.dat b/xts5/Xlib9/XFillPolygon/a46.dat
index b0f39d49..b0f39d49 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a46.dat
+++ b/xts5/Xlib9/XFillPolygon/a46.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a8.dat b/xts5/Xlib9/XFillPolygon/a8.dat
index e51d9b3d..e51d9b3d 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a8.dat
+++ b/xts5/Xlib9/XFillPolygon/a8.dat
diff --git a/xts5/tset/Xlib9/XFillPolygon/a9.dat b/xts5/Xlib9/XFillPolygon/a9.dat
index 9bacd5d5..9bacd5d5 100644
--- a/xts5/tset/Xlib9/XFillPolygon/a9.dat
+++ b/xts5/Xlib9/XFillPolygon/a9.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/XFillRectangle.m b/xts5/Xlib9/XFillRectangle/XFillRectangle.m
index b530ee2d..b530ee2d 100644
--- a/xts5/tset/Xlib9/XFillRectangle/XFillRectangle.m
+++ b/xts5/Xlib9/XFillRectangle/XFillRectangle.m
diff --git a/xts5/tset/Xlib9/XFillRectangle/a22.dat b/xts5/Xlib9/XFillRectangle/a22.dat
index 14fa7b9b..14fa7b9b 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a22.dat
+++ b/xts5/Xlib9/XFillRectangle/a22.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a24.dat b/xts5/Xlib9/XFillRectangle/a24.dat
index 5874634c..5874634c 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a24.dat
+++ b/xts5/Xlib9/XFillRectangle/a24.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a25.dat b/xts5/Xlib9/XFillRectangle/a25.dat
index 0cdafec0..0cdafec0 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a25.dat
+++ b/xts5/Xlib9/XFillRectangle/a25.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a29.dat b/xts5/Xlib9/XFillRectangle/a29.dat
index 24cfd33f..24cfd33f 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a29.dat
+++ b/xts5/Xlib9/XFillRectangle/a29.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a32.dat b/xts5/Xlib9/XFillRectangle/a32.dat
index 4292ec3e..4292ec3e 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a32.dat
+++ b/xts5/Xlib9/XFillRectangle/a32.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a34.dat b/xts5/Xlib9/XFillRectangle/a34.dat
index 14b98b33..14b98b33 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a34.dat
+++ b/xts5/Xlib9/XFillRectangle/a34.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a36.dat b/xts5/Xlib9/XFillRectangle/a36.dat
index 9cef7599..9cef7599 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a36.dat
+++ b/xts5/Xlib9/XFillRectangle/a36.dat
diff --git a/xts5/tset/Xlib9/XFillRectangle/a38.dat b/xts5/Xlib9/XFillRectangle/a38.dat
index 84c5db99..84c5db99 100644
--- a/xts5/tset/Xlib9/XFillRectangle/a38.dat
+++ b/xts5/Xlib9/XFillRectangle/a38.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/XFillRectangles.m b/xts5/Xlib9/XFillRectangles/XFillRectangles.m
index e9be4088..e9be4088 100644
--- a/xts5/tset/Xlib9/XFillRectangles/XFillRectangles.m
+++ b/xts5/Xlib9/XFillRectangles/XFillRectangles.m
diff --git a/xts5/tset/Xlib9/XFillRectangles/a1.dat b/xts5/Xlib9/XFillRectangles/a1.dat
index 58f81ab9..58f81ab9 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a1.dat
+++ b/xts5/Xlib9/XFillRectangles/a1.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a23.dat b/xts5/Xlib9/XFillRectangles/a23.dat
index 7374f0fd..7374f0fd 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a23.dat
+++ b/xts5/Xlib9/XFillRectangles/a23.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a24.dat b/xts5/Xlib9/XFillRectangles/a24.dat
index 5ab9a02d..5ab9a02d 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a24.dat
+++ b/xts5/Xlib9/XFillRectangles/a24.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a25.dat b/xts5/Xlib9/XFillRectangles/a25.dat
index d586c74c..d586c74c 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a25.dat
+++ b/xts5/Xlib9/XFillRectangles/a25.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a26.dat b/xts5/Xlib9/XFillRectangles/a26.dat
index ac8bee5b..ac8bee5b 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a26.dat
+++ b/xts5/Xlib9/XFillRectangles/a26.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a30.dat b/xts5/Xlib9/XFillRectangles/a30.dat
index 9fe9acc7..9fe9acc7 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a30.dat
+++ b/xts5/Xlib9/XFillRectangles/a30.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a33.dat b/xts5/Xlib9/XFillRectangles/a33.dat
index 3fe8b3b8..3fe8b3b8 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a33.dat
+++ b/xts5/Xlib9/XFillRectangles/a33.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a35.dat b/xts5/Xlib9/XFillRectangles/a35.dat
index 5108dab0..5108dab0 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a35.dat
+++ b/xts5/Xlib9/XFillRectangles/a35.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a37.dat b/xts5/Xlib9/XFillRectangles/a37.dat
index 79bc89a9..79bc89a9 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a37.dat
+++ b/xts5/Xlib9/XFillRectangles/a37.dat
diff --git a/xts5/tset/Xlib9/XFillRectangles/a39.dat b/xts5/Xlib9/XFillRectangles/a39.dat
index d79d5b8d..d79d5b8d 100644
--- a/xts5/tset/Xlib9/XFillRectangles/a39.dat
+++ b/xts5/Xlib9/XFillRectangles/a39.dat
diff --git a/xts5/tset/Xlib9/XFreeFont/XFreeFont.m b/xts5/Xlib9/XFreeFont/XFreeFont.m
index 87fc5d86..87fc5d86 100644
--- a/xts5/tset/Xlib9/XFreeFont/XFreeFont.m
+++ b/xts5/Xlib9/XFreeFont/XFreeFont.m
diff --git a/xts5/tset/Xlib9/XFreeFontInfo/XFreeFontInfo.m b/xts5/Xlib9/XFreeFontInfo/XFreeFontInfo.m
index f9d0a66d..f9d0a66d 100644
--- a/xts5/tset/Xlib9/XFreeFontInfo/XFreeFontInfo.m
+++ b/xts5/Xlib9/XFreeFontInfo/XFreeFontInfo.m
diff --git a/xts5/tset/Xlib9/XFreeFontNames/XFreeFontNames.m b/xts5/Xlib9/XFreeFontNames/XFreeFontNames.m
index 75672eb7..75672eb7 100644
--- a/xts5/tset/Xlib9/XFreeFontNames/XFreeFontNames.m
+++ b/xts5/Xlib9/XFreeFontNames/XFreeFontNames.m
diff --git a/xts5/tset/Xlib9/XFreeFontPath/XFreeFontPath.m b/xts5/Xlib9/XFreeFontPath/XFreeFontPath.m
index 2c20b005..2c20b005 100644
--- a/xts5/tset/Xlib9/XFreeFontPath/XFreeFontPath.m
+++ b/xts5/Xlib9/XFreeFontPath/XFreeFontPath.m
diff --git a/xts5/tset/Xlib9/XGetFontPath/XGetFontPath.m b/xts5/Xlib9/XGetFontPath/XGetFontPath.m
index 1486ec4e..1486ec4e 100644
--- a/xts5/tset/Xlib9/XGetFontPath/XGetFontPath.m
+++ b/xts5/Xlib9/XGetFontPath/XGetFontPath.m
diff --git a/xts5/tset/Xlib9/XGetFontProperty/XGetFontProperty.m b/xts5/Xlib9/XGetFontProperty/XGetFontProperty.m
index 19eca5b1..19eca5b1 100644
--- a/xts5/tset/Xlib9/XGetFontProperty/XGetFontProperty.m
+++ b/xts5/Xlib9/XGetFontProperty/XGetFontProperty.m
diff --git a/xts5/tset/Xlib9/XGetImage/XGetImage.m b/xts5/Xlib9/XGetImage/XGetImage.m
index 6ea90319..6ea90319 100644
--- a/xts5/tset/Xlib9/XGetImage/XGetImage.m
+++ b/xts5/Xlib9/XGetImage/XGetImage.m
diff --git a/xts5/tset/Xlib9/XGetSubImage/XGetSubImage.m b/xts5/Xlib9/XGetSubImage/XGetSubImage.m
index 9e20d066..9e20d066 100644
--- a/xts5/tset/Xlib9/XGetSubImage/XGetSubImage.m
+++ b/xts5/Xlib9/XGetSubImage/XGetSubImage.m
diff --git a/xts5/tset/Xlib9/XListFonts/XListFonts.m b/xts5/Xlib9/XListFonts/XListFonts.m
index 3fe41cfe..3fe41cfe 100644
--- a/xts5/tset/Xlib9/XListFonts/XListFonts.m
+++ b/xts5/Xlib9/XListFonts/XListFonts.m
diff --git a/xts5/tset/Xlib9/XListFontsWithInfo/XListFontsWithInfo.m b/xts5/Xlib9/XListFontsWithInfo/XListFontsWithInfo.m
index 7e9f9528..7e9f9528 100644
--- a/xts5/tset/Xlib9/XListFontsWithInfo/XListFontsWithInfo.m
+++ b/xts5/Xlib9/XListFontsWithInfo/XListFontsWithInfo.m
diff --git a/xts5/tset/Xlib9/XLoadFont/XLoadFont.m b/xts5/Xlib9/XLoadFont/XLoadFont.m
index 6df55b36..6df55b36 100644
--- a/xts5/tset/Xlib9/XLoadFont/XLoadFont.m
+++ b/xts5/Xlib9/XLoadFont/XLoadFont.m
diff --git a/xts5/tset/Xlib9/XLoadFont/a2.dat b/xts5/Xlib9/XLoadFont/a2.dat
index 541f6546..541f6546 100644
--- a/xts5/tset/Xlib9/XLoadFont/a2.dat
+++ b/xts5/Xlib9/XLoadFont/a2.dat
diff --git a/xts5/tset/Xlib9/XLoadQueryFont/XLoadQueryFont.m b/xts5/Xlib9/XLoadQueryFont/XLoadQueryFont.m
index 2f54c5d3..2f54c5d3 100644
--- a/xts5/tset/Xlib9/XLoadQueryFont/XLoadQueryFont.m
+++ b/xts5/Xlib9/XLoadQueryFont/XLoadQueryFont.m
diff --git a/xts5/tset/Xlib9/XLoadQueryFont/a2.dat b/xts5/Xlib9/XLoadQueryFont/a2.dat
index 50defaf8..50defaf8 100644
--- a/xts5/tset/Xlib9/XLoadQueryFont/a2.dat
+++ b/xts5/Xlib9/XLoadQueryFont/a2.dat
diff --git a/xts5/tset/Xlib9/XPutImage/XPutImage.m b/xts5/Xlib9/XPutImage/XPutImage.m
index f7cb0557..f7cb0557 100644
--- a/xts5/tset/Xlib9/XPutImage/XPutImage.m
+++ b/xts5/Xlib9/XPutImage/XPutImage.m
diff --git a/xts5/tset/Xlib9/XPutImage/a24.dat b/xts5/Xlib9/XPutImage/a24.dat
index 3fd841d3..3fd841d3 100644
--- a/xts5/tset/Xlib9/XPutImage/a24.dat
+++ b/xts5/Xlib9/XPutImage/a24.dat
diff --git a/xts5/tset/Xlib9/XPutImage/a27.dat b/xts5/Xlib9/XPutImage/a27.dat
index 78a155e9..78a155e9 100644
--- a/xts5/tset/Xlib9/XPutImage/a27.dat
+++ b/xts5/Xlib9/XPutImage/a27.dat
diff --git a/xts5/tset/Xlib9/XPutImage/a29.dat b/xts5/Xlib9/XPutImage/a29.dat
index 634196f5..634196f5 100644
--- a/xts5/tset/Xlib9/XPutImage/a29.dat
+++ b/xts5/Xlib9/XPutImage/a29.dat
diff --git a/xts5/tset/Xlib9/XPutImage/a31.dat b/xts5/Xlib9/XPutImage/a31.dat
index fbb919ad..fbb919ad 100644
--- a/xts5/tset/Xlib9/XPutImage/a31.dat
+++ b/xts5/Xlib9/XPutImage/a31.dat
diff --git a/xts5/tset/Xlib9/XQueryFont/XQueryFont.m b/xts5/Xlib9/XQueryFont/XQueryFont.m
index 2e5ec571..2e5ec571 100644
--- a/xts5/tset/Xlib9/XQueryFont/XQueryFont.m
+++ b/xts5/Xlib9/XQueryFont/XQueryFont.m
diff --git a/xts5/tset/Xlib9/XQueryTextExtents/XQueryTextExtents.m b/xts5/Xlib9/XQueryTextExtents/XQueryTextExtents.m
index 868cb1c0..868cb1c0 100644
--- a/xts5/tset/Xlib9/XQueryTextExtents/XQueryTextExtents.m
+++ b/xts5/Xlib9/XQueryTextExtents/XQueryTextExtents.m
diff --git a/xts5/tset/Xlib9/XQueryTextExtents16/XQueryTextExtents16.m b/xts5/Xlib9/XQueryTextExtents16/XQueryTextExtents16.m
index 81e67060..81e67060 100644
--- a/xts5/tset/Xlib9/XQueryTextExtents16/XQueryTextExtents16.m
+++ b/xts5/Xlib9/XQueryTextExtents16/XQueryTextExtents16.m
diff --git a/xts5/tset/Xlib9/XSetFontPath/XSetFontPath.m b/xts5/Xlib9/XSetFontPath/XSetFontPath.m
index 5c1c3f0f..5c1c3f0f 100644
--- a/xts5/tset/Xlib9/XSetFontPath/XSetFontPath.m
+++ b/xts5/Xlib9/XSetFontPath/XSetFontPath.m
diff --git a/xts5/tset/Xlib9/XTextExtents/XTextExtents.m b/xts5/Xlib9/XTextExtents/XTextExtents.m
index 5f07bf27..5f07bf27 100644
--- a/xts5/tset/Xlib9/XTextExtents/XTextExtents.m
+++ b/xts5/Xlib9/XTextExtents/XTextExtents.m
diff --git a/xts5/tset/Xlib9/XTextExtents16/XTextExtents16.m b/xts5/Xlib9/XTextExtents16/XTextExtents16.m
index 78f499b4..78f499b4 100644
--- a/xts5/tset/Xlib9/XTextExtents16/XTextExtents16.m
+++ b/xts5/Xlib9/XTextExtents16/XTextExtents16.m
diff --git a/xts5/tset/Xlib9/XTextWidth/XTextWidth.m b/xts5/Xlib9/XTextWidth/XTextWidth.m
index 804f089b..804f089b 100644
--- a/xts5/tset/Xlib9/XTextWidth/XTextWidth.m
+++ b/xts5/Xlib9/XTextWidth/XTextWidth.m
diff --git a/xts5/tset/Xlib9/XTextWidth16/XTextWidth16.m b/xts5/Xlib9/XTextWidth16/XTextWidth16.m
index a1556dc6..a1556dc6 100644
--- a/xts5/tset/Xlib9/XTextWidth16/XTextWidth16.m
+++ b/xts5/Xlib9/XTextWidth16/XTextWidth16.m
diff --git a/xts5/tset/Xlib9/XUnloadFont/XUnloadFont.m b/xts5/Xlib9/XUnloadFont/XUnloadFont.m
index f411f3f7..f411f3f7 100644
--- a/xts5/tset/Xlib9/XUnloadFont/XUnloadFont.m
+++ b/xts5/Xlib9/XUnloadFont/XUnloadFont.m
diff --git a/xts5/tset/Xopen/.gitignore b/xts5/Xopen/.gitignore
index 7754bef0..7754bef0 100644
--- a/xts5/tset/Xopen/.gitignore
+++ b/xts5/Xopen/.gitignore
diff --git a/xts5/tset/Xopen/Makefile.am b/xts5/Xopen/Makefile.am
index 45e22d40..45e22d40 100644
--- a/xts5/tset/Xopen/Makefile.am
+++ b/xts5/Xopen/Makefile.am
diff --git a/xts5/tset/Xopen/XAllocNamedColor/XAllocNamedColor.m b/xts5/Xopen/XAllocNamedColor/XAllocNamedColor.m
index 00f978ad..00f978ad 100644
--- a/xts5/tset/Xopen/XAllocNamedColor/XAllocNamedColor.m
+++ b/xts5/Xopen/XAllocNamedColor/XAllocNamedColor.m
diff --git a/xts5/tset/Xopen/XCreateFontCursor/XCreateFontCursor.m b/xts5/Xopen/XCreateFontCursor/XCreateFontCursor.m
index 032d02d3..032d02d3 100644
--- a/xts5/tset/Xopen/XCreateFontCursor/XCreateFontCursor.m
+++ b/xts5/Xopen/XCreateFontCursor/XCreateFontCursor.m
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/Test1.c b/xts5/Xopen/XKeysymToKeycode/Test1.c
index 780d8553..780d8553 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/Test1.c
+++ b/xts5/Xopen/XKeysymToKeycode/Test1.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/Test2.c b/xts5/Xopen/XKeysymToKeycode/Test2.c
index d6fe5e89..d6fe5e89 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/Test2.c
+++ b/xts5/Xopen/XKeysymToKeycode/Test2.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/Test3.c b/xts5/Xopen/XKeysymToKeycode/Test3.c
index 681aeb8f..681aeb8f 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/Test3.c
+++ b/xts5/Xopen/XKeysymToKeycode/Test3.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/Test4.c b/xts5/Xopen/XKeysymToKeycode/Test4.c
index 449fafe1..449fafe1 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/Test4.c
+++ b/xts5/Xopen/XKeysymToKeycode/Test4.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestA.c b/xts5/Xopen/XKeysymToKeycode/TestA.c
index 61743db4..61743db4 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestA.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestA.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestC.c b/xts5/Xopen/XKeysymToKeycode/TestC.c
index a3e6647d..a3e6647d 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestC.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestC.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestG.c b/xts5/Xopen/XKeysymToKeycode/TestG.c
index 3551a96e..3551a96e 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestG.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestG.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestH.c b/xts5/Xopen/XKeysymToKeycode/TestH.c
index ea42345a..ea42345a 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestH.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestH.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestK.c b/xts5/Xopen/XKeysymToKeycode/TestK.c
index 219869e3..219869e3 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestK.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestK.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestL.c b/xts5/Xopen/XKeysymToKeycode/TestL.c
index a3f2cc05..a3f2cc05 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestL.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestL.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestM.c b/xts5/Xopen/XKeysymToKeycode/TestM.c
index f388ba83..f388ba83 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestM.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestM.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestP.c b/xts5/Xopen/XKeysymToKeycode/TestP.c
index e85d84eb..e85d84eb 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestP.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestP.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestS.c b/xts5/Xopen/XKeysymToKeycode/TestS.c
index e76378ad..e76378ad 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestS.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestS.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/TestT.c b/xts5/Xopen/XKeysymToKeycode/TestT.c
index 6dfa4f1a..6dfa4f1a 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/TestT.c
+++ b/xts5/Xopen/XKeysymToKeycode/TestT.c
diff --git a/xts5/tset/Xopen/XKeysymToKeycode/XKeysymToKeycode.m b/xts5/Xopen/XKeysymToKeycode/XKeysymToKeycode.m
index 2affb55f..2affb55f 100644
--- a/xts5/tset/Xopen/XKeysymToKeycode/XKeysymToKeycode.m
+++ b/xts5/Xopen/XKeysymToKeycode/XKeysymToKeycode.m
diff --git a/xts5/tset/Xopen/XLookupColor/XLookupColor.m b/xts5/Xopen/XLookupColor/XLookupColor.m
index 463cff1f..463cff1f 100644
--- a/xts5/tset/Xopen/XLookupColor/XLookupColor.m
+++ b/xts5/Xopen/XLookupColor/XLookupColor.m
diff --git a/xts5/tset/Xopen/XStringToKeysym/Test1.c b/xts5/Xopen/XStringToKeysym/Test1.c
index 1c434f94..1c434f94 100644
--- a/xts5/tset/Xopen/XStringToKeysym/Test1.c
+++ b/xts5/Xopen/XStringToKeysym/Test1.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/Test2.c b/xts5/Xopen/XStringToKeysym/Test2.c
index dab2770b..dab2770b 100644
--- a/xts5/tset/Xopen/XStringToKeysym/Test2.c
+++ b/xts5/Xopen/XStringToKeysym/Test2.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/Test3.c b/xts5/Xopen/XStringToKeysym/Test3.c
index b4d82fea..b4d82fea 100644
--- a/xts5/tset/Xopen/XStringToKeysym/Test3.c
+++ b/xts5/Xopen/XStringToKeysym/Test3.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/Test4.c b/xts5/Xopen/XStringToKeysym/Test4.c
index 4e3db003..4e3db003 100644
--- a/xts5/tset/Xopen/XStringToKeysym/Test4.c
+++ b/xts5/Xopen/XStringToKeysym/Test4.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestA.c b/xts5/Xopen/XStringToKeysym/TestA.c
index 351a5c94..351a5c94 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestA.c
+++ b/xts5/Xopen/XStringToKeysym/TestA.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestC.c b/xts5/Xopen/XStringToKeysym/TestC.c
index 39063da7..39063da7 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestC.c
+++ b/xts5/Xopen/XStringToKeysym/TestC.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestG.c b/xts5/Xopen/XStringToKeysym/TestG.c
index b7914b5b..b7914b5b 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestG.c
+++ b/xts5/Xopen/XStringToKeysym/TestG.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestH.c b/xts5/Xopen/XStringToKeysym/TestH.c
index 482ab2b4..482ab2b4 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestH.c
+++ b/xts5/Xopen/XStringToKeysym/TestH.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestK.c b/xts5/Xopen/XStringToKeysym/TestK.c
index 4f51eb1e..4f51eb1e 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestK.c
+++ b/xts5/Xopen/XStringToKeysym/TestK.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestL.c b/xts5/Xopen/XStringToKeysym/TestL.c
index f6d94f7d..f6d94f7d 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestL.c
+++ b/xts5/Xopen/XStringToKeysym/TestL.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestM.c b/xts5/Xopen/XStringToKeysym/TestM.c
index b5482f0f..b5482f0f 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestM.c
+++ b/xts5/Xopen/XStringToKeysym/TestM.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestP.c b/xts5/Xopen/XStringToKeysym/TestP.c
index 253ffc09..253ffc09 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestP.c
+++ b/xts5/Xopen/XStringToKeysym/TestP.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestS.c b/xts5/Xopen/XStringToKeysym/TestS.c
index 6957dc81..6957dc81 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestS.c
+++ b/xts5/Xopen/XStringToKeysym/TestS.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/TestT.c b/xts5/Xopen/XStringToKeysym/TestT.c
index 36d69cc2..36d69cc2 100644
--- a/xts5/tset/Xopen/XStringToKeysym/TestT.c
+++ b/xts5/Xopen/XStringToKeysym/TestT.c
diff --git a/xts5/tset/Xopen/XStringToKeysym/XStringToKeysym.m b/xts5/Xopen/XStringToKeysym/XStringToKeysym.m
index 8d994f4a..8d994f4a 100644
--- a/xts5/tset/Xopen/XStringToKeysym/XStringToKeysym.m
+++ b/xts5/Xopen/XStringToKeysym/XStringToKeysym.m
diff --git a/xts5/tset/Xopen/cursorfont/cursorfont.m b/xts5/Xopen/cursorfont/cursorfont.m
index edad5c83..edad5c83 100644
--- a/xts5/tset/Xopen/cursorfont/cursorfont.m
+++ b/xts5/Xopen/cursorfont/cursorfont.m
diff --git a/xts5/tset/Xopen/keysym/Test0.c b/xts5/Xopen/keysym/Test0.c
index 1e43903b..1e43903b 100644
--- a/xts5/tset/Xopen/keysym/Test0.c
+++ b/xts5/Xopen/keysym/Test0.c
diff --git a/xts5/tset/Xopen/keysym/Test1.c b/xts5/Xopen/keysym/Test1.c
index 90e18c71..90e18c71 100644
--- a/xts5/tset/Xopen/keysym/Test1.c
+++ b/xts5/Xopen/keysym/Test1.c
diff --git a/xts5/tset/Xopen/keysym/Test2.c b/xts5/Xopen/keysym/Test2.c
index 96dc639c..96dc639c 100644
--- a/xts5/tset/Xopen/keysym/Test2.c
+++ b/xts5/Xopen/keysym/Test2.c
diff --git a/xts5/tset/Xopen/keysym/Test3.c b/xts5/Xopen/keysym/Test3.c
index 61f2fe70..61f2fe70 100644
--- a/xts5/tset/Xopen/keysym/Test3.c
+++ b/xts5/Xopen/keysym/Test3.c
diff --git a/xts5/tset/Xopen/keysym/Test4.c b/xts5/Xopen/keysym/Test4.c
index aaeb634e..aaeb634e 100644
--- a/xts5/tset/Xopen/keysym/Test4.c
+++ b/xts5/Xopen/keysym/Test4.c
diff --git a/xts5/tset/Xopen/keysym/TestG.c b/xts5/Xopen/keysym/TestG.c
index 9b45e33a..9b45e33a 100644
--- a/xts5/tset/Xopen/keysym/TestG.c
+++ b/xts5/Xopen/keysym/TestG.c
diff --git a/xts5/tset/Xopen/keysym/TestM.c b/xts5/Xopen/keysym/TestM.c
index c6e0f847..c6e0f847 100644
--- a/xts5/tset/Xopen/keysym/TestM.c
+++ b/xts5/Xopen/keysym/TestM.c
diff --git a/xts5/tset/Xopen/keysym/keysym.m b/xts5/Xopen/keysym/keysym.m
index 1280c4ee..1280c4ee 100644
--- a/xts5/tset/Xopen/keysym/keysym.m
+++ b/xts5/Xopen/keysym/keysym.m
diff --git a/xts5/tset/Xopen/keysymdef/Test0.c b/xts5/Xopen/keysymdef/Test0.c
index 53bd53e8..53bd53e8 100644
--- a/xts5/tset/Xopen/keysymdef/Test0.c
+++ b/xts5/Xopen/keysymdef/Test0.c
diff --git a/xts5/tset/Xopen/keysymdef/Test1.c b/xts5/Xopen/keysymdef/Test1.c
index e6a8dd6e..e6a8dd6e 100644
--- a/xts5/tset/Xopen/keysymdef/Test1.c
+++ b/xts5/Xopen/keysymdef/Test1.c
diff --git a/xts5/tset/Xopen/keysymdef/Test2.c b/xts5/Xopen/keysymdef/Test2.c
index d512c380..d512c380 100644
--- a/xts5/tset/Xopen/keysymdef/Test2.c
+++ b/xts5/Xopen/keysymdef/Test2.c
diff --git a/xts5/tset/Xopen/keysymdef/Test3.c b/xts5/Xopen/keysymdef/Test3.c
index 9bf79d5f..9bf79d5f 100644
--- a/xts5/tset/Xopen/keysymdef/Test3.c
+++ b/xts5/Xopen/keysymdef/Test3.c
diff --git a/xts5/tset/Xopen/keysymdef/Test4.c b/xts5/Xopen/keysymdef/Test4.c
index 92e17fde..92e17fde 100644
--- a/xts5/tset/Xopen/keysymdef/Test4.c
+++ b/xts5/Xopen/keysymdef/Test4.c
diff --git a/xts5/tset/Xopen/keysymdef/TestA.c b/xts5/Xopen/keysymdef/TestA.c
index f447f147..f447f147 100644
--- a/xts5/tset/Xopen/keysymdef/TestA.c
+++ b/xts5/Xopen/keysymdef/TestA.c
diff --git a/xts5/tset/Xopen/keysymdef/TestC.c b/xts5/Xopen/keysymdef/TestC.c
index b9ddc357..b9ddc357 100644
--- a/xts5/tset/Xopen/keysymdef/TestC.c
+++ b/xts5/Xopen/keysymdef/TestC.c
diff --git a/xts5/tset/Xopen/keysymdef/TestG.c b/xts5/Xopen/keysymdef/TestG.c
index 751bbcb9..751bbcb9 100644
--- a/xts5/tset/Xopen/keysymdef/TestG.c
+++ b/xts5/Xopen/keysymdef/TestG.c
diff --git a/xts5/tset/Xopen/keysymdef/TestH.c b/xts5/Xopen/keysymdef/TestH.c
index ccc2b0f4..ccc2b0f4 100644
--- a/xts5/tset/Xopen/keysymdef/TestH.c
+++ b/xts5/Xopen/keysymdef/TestH.c
diff --git a/xts5/tset/Xopen/keysymdef/TestK.c b/xts5/Xopen/keysymdef/TestK.c
index 8639256e..8639256e 100644
--- a/xts5/tset/Xopen/keysymdef/TestK.c
+++ b/xts5/Xopen/keysymdef/TestK.c
diff --git a/xts5/tset/Xopen/keysymdef/TestL.c b/xts5/Xopen/keysymdef/TestL.c
index 4d116146..4d116146 100644
--- a/xts5/tset/Xopen/keysymdef/TestL.c
+++ b/xts5/Xopen/keysymdef/TestL.c
diff --git a/xts5/tset/Xopen/keysymdef/TestM.c b/xts5/Xopen/keysymdef/TestM.c
index 7f8c65af..7f8c65af 100644
--- a/xts5/tset/Xopen/keysymdef/TestM.c
+++ b/xts5/Xopen/keysymdef/TestM.c
diff --git a/xts5/tset/Xopen/keysymdef/TestP.c b/xts5/Xopen/keysymdef/TestP.c
index 8002adc5..8002adc5 100644
--- a/xts5/tset/Xopen/keysymdef/TestP.c
+++ b/xts5/Xopen/keysymdef/TestP.c
diff --git a/xts5/tset/Xopen/keysymdef/TestS.c b/xts5/Xopen/keysymdef/TestS.c
index 8435a403..8435a403 100644
--- a/xts5/tset/Xopen/keysymdef/TestS.c
+++ b/xts5/Xopen/keysymdef/TestS.c
diff --git a/xts5/tset/Xopen/keysymdef/TestT.c b/xts5/Xopen/keysymdef/TestT.c
index 68c148c0..68c148c0 100644
--- a/xts5/tset/Xopen/keysymdef/TestT.c
+++ b/xts5/Xopen/keysymdef/TestT.c
diff --git a/xts5/tset/Xopen/keysymdef/keysymdef.m b/xts5/Xopen/keysymdef/keysymdef.m
index 5d4f979d..5d4f979d 100644
--- a/xts5/tset/Xopen/keysymdef/keysymdef.m
+++ b/xts5/Xopen/keysymdef/keysymdef.m
diff --git a/xts5/tset/Xproto/.gitignore b/xts5/Xproto/.gitignore
index 8b53e208..8b53e208 100644
--- a/xts5/tset/Xproto/.gitignore
+++ b/xts5/Xproto/.gitignore
diff --git a/xts5/tset/Xproto/Makefile.am b/xts5/Xproto/Makefile.am
index 14082685..14082685 100644
--- a/xts5/tset/Xproto/Makefile.am
+++ b/xts5/Xproto/Makefile.am
diff --git a/xts5/tset/Xproto/pAllocColor/pAllocColor.m b/xts5/Xproto/pAllocColor/pAllocColor.m
index 2e7ae868..2e7ae868 100644
--- a/xts5/tset/Xproto/pAllocColor/pAllocColor.m
+++ b/xts5/Xproto/pAllocColor/pAllocColor.m
diff --git a/xts5/tset/Xproto/pAllocColorCells/pAllocColorCells.m b/xts5/Xproto/pAllocColorCells/pAllocColorCells.m
index 6413390c..6413390c 100644
--- a/xts5/tset/Xproto/pAllocColorCells/pAllocColorCells.m
+++ b/xts5/Xproto/pAllocColorCells/pAllocColorCells.m
diff --git a/xts5/tset/Xproto/pAllocColorPlanes/pAllocColorPlanes.m b/xts5/Xproto/pAllocColorPlanes/pAllocColorPlanes.m
index 76c7502b..76c7502b 100644
--- a/xts5/tset/Xproto/pAllocColorPlanes/pAllocColorPlanes.m
+++ b/xts5/Xproto/pAllocColorPlanes/pAllocColorPlanes.m
diff --git a/xts5/tset/Xproto/pAllocNamedColor/pAllocNamedColor.m b/xts5/Xproto/pAllocNamedColor/pAllocNamedColor.m
index 3cdbae4f..3cdbae4f 100644
--- a/xts5/tset/Xproto/pAllocNamedColor/pAllocNamedColor.m
+++ b/xts5/Xproto/pAllocNamedColor/pAllocNamedColor.m
diff --git a/xts5/tset/Xproto/pAllowEvents/pAllowEvents.m b/xts5/Xproto/pAllowEvents/pAllowEvents.m
index 57e6dcb2..57e6dcb2 100644
--- a/xts5/tset/Xproto/pAllowEvents/pAllowEvents.m
+++ b/xts5/Xproto/pAllowEvents/pAllowEvents.m
diff --git a/xts5/tset/Xproto/pBadRequest/pBadRequest.m b/xts5/Xproto/pBadRequest/pBadRequest.m
index df03d1a7..df03d1a7 100644
--- a/xts5/tset/Xproto/pBadRequest/pBadRequest.m
+++ b/xts5/Xproto/pBadRequest/pBadRequest.m
diff --git a/xts5/tset/Xproto/pBell/pBell.m b/xts5/Xproto/pBell/pBell.m
index 0b58a04d..0b58a04d 100644
--- a/xts5/tset/Xproto/pBell/pBell.m
+++ b/xts5/Xproto/pBell/pBell.m
diff --git a/xts5/tset/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab.m b/xts5/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab.m
index a2e0eec0..a2e0eec0 100644
--- a/xts5/tset/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab.m
+++ b/xts5/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab.m
diff --git a/xts5/tset/Xproto/pChangeGC/pChangeGC.m b/xts5/Xproto/pChangeGC/pChangeGC.m
index cc80c0c6..cc80c0c6 100644
--- a/xts5/tset/Xproto/pChangeGC/pChangeGC.m
+++ b/xts5/Xproto/pChangeGC/pChangeGC.m
diff --git a/xts5/tset/Xproto/pChangeHosts/pChangeHosts.m b/xts5/Xproto/pChangeHosts/pChangeHosts.m
index 00a4e3aa..00a4e3aa 100644
--- a/xts5/tset/Xproto/pChangeHosts/pChangeHosts.m
+++ b/xts5/Xproto/pChangeHosts/pChangeHosts.m
diff --git a/xts5/tset/Xproto/pChangeKeyboardControl/pChangeKeyboardControl.m b/xts5/Xproto/pChangeKeyboardControl/pChangeKeyboardControl.m
index 974c3d99..974c3d99 100644
--- a/xts5/tset/Xproto/pChangeKeyboardControl/pChangeKeyboardControl.m
+++ b/xts5/Xproto/pChangeKeyboardControl/pChangeKeyboardControl.m
diff --git a/xts5/tset/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping.m b/xts5/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping.m
index 730dca9e..730dca9e 100644
--- a/xts5/tset/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping.m
+++ b/xts5/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping.m
diff --git a/xts5/tset/Xproto/pChangePointerControl/pChangePointerControl.m b/xts5/Xproto/pChangePointerControl/pChangePointerControl.m
index 67c3d320..67c3d320 100644
--- a/xts5/tset/Xproto/pChangePointerControl/pChangePointerControl.m
+++ b/xts5/Xproto/pChangePointerControl/pChangePointerControl.m
diff --git a/xts5/tset/Xproto/pChangeProperty/pChangeProperty.m b/xts5/Xproto/pChangeProperty/pChangeProperty.m
index b2ecb082..b2ecb082 100644
--- a/xts5/tset/Xproto/pChangeProperty/pChangeProperty.m
+++ b/xts5/Xproto/pChangeProperty/pChangeProperty.m
diff --git a/xts5/tset/Xproto/pChangeSaveSet/pChangeSaveSet.m b/xts5/Xproto/pChangeSaveSet/pChangeSaveSet.m
index a61edbe4..a61edbe4 100644
--- a/xts5/tset/Xproto/pChangeSaveSet/pChangeSaveSet.m
+++ b/xts5/Xproto/pChangeSaveSet/pChangeSaveSet.m
diff --git a/xts5/tset/Xproto/pChangeWindowAttributes/pChangeWindowAttributes.m b/xts5/Xproto/pChangeWindowAttributes/pChangeWindowAttributes.m
index 08d51666..08d51666 100644
--- a/xts5/tset/Xproto/pChangeWindowAttributes/pChangeWindowAttributes.m
+++ b/xts5/Xproto/pChangeWindowAttributes/pChangeWindowAttributes.m
diff --git a/xts5/tset/Xproto/pCirculateWindow/pCirculateWindow.m b/xts5/Xproto/pCirculateWindow/pCirculateWindow.m
index 41f8338f..41f8338f 100644
--- a/xts5/tset/Xproto/pCirculateWindow/pCirculateWindow.m
+++ b/xts5/Xproto/pCirculateWindow/pCirculateWindow.m
diff --git a/xts5/tset/Xproto/pClearArea/pClearArea.m b/xts5/Xproto/pClearArea/pClearArea.m
index a7139683..a7139683 100644
--- a/xts5/tset/Xproto/pClearArea/pClearArea.m
+++ b/xts5/Xproto/pClearArea/pClearArea.m
diff --git a/xts5/tset/Xproto/pCloseFont/pCloseFont.m b/xts5/Xproto/pCloseFont/pCloseFont.m
index 6461b13e..6461b13e 100644
--- a/xts5/tset/Xproto/pCloseFont/pCloseFont.m
+++ b/xts5/Xproto/pCloseFont/pCloseFont.m
diff --git a/xts5/tset/Xproto/pConfigureWindow/pConfigureWindow.m b/xts5/Xproto/pConfigureWindow/pConfigureWindow.m
index 00619779..00619779 100644
--- a/xts5/tset/Xproto/pConfigureWindow/pConfigureWindow.m
+++ b/xts5/Xproto/pConfigureWindow/pConfigureWindow.m
diff --git a/xts5/tset/Xproto/pConvertSelection/pConvertSelection.m b/xts5/Xproto/pConvertSelection/pConvertSelection.m
index 5af5e058..5af5e058 100644
--- a/xts5/tset/Xproto/pConvertSelection/pConvertSelection.m
+++ b/xts5/Xproto/pConvertSelection/pConvertSelection.m
diff --git a/xts5/tset/Xproto/pCopyArea/pCopyArea.m b/xts5/Xproto/pCopyArea/pCopyArea.m
index 2b97c282..2b97c282 100644
--- a/xts5/tset/Xproto/pCopyArea/pCopyArea.m
+++ b/xts5/Xproto/pCopyArea/pCopyArea.m
diff --git a/xts5/tset/Xproto/pCopyColormapAndFree/pCopyColormapAndFree.m b/xts5/Xproto/pCopyColormapAndFree/pCopyColormapAndFree.m
index be32bcc8..be32bcc8 100644
--- a/xts5/tset/Xproto/pCopyColormapAndFree/pCopyColormapAndFree.m
+++ b/xts5/Xproto/pCopyColormapAndFree/pCopyColormapAndFree.m
diff --git a/xts5/tset/Xproto/pCopyGC/pCopyGC.m b/xts5/Xproto/pCopyGC/pCopyGC.m
index 700ec518..700ec518 100644
--- a/xts5/tset/Xproto/pCopyGC/pCopyGC.m
+++ b/xts5/Xproto/pCopyGC/pCopyGC.m
diff --git a/xts5/tset/Xproto/pCopyPlane/pCopyPlane.m b/xts5/Xproto/pCopyPlane/pCopyPlane.m
index ce761bd6..ce761bd6 100644
--- a/xts5/tset/Xproto/pCopyPlane/pCopyPlane.m
+++ b/xts5/Xproto/pCopyPlane/pCopyPlane.m
diff --git a/xts5/tset/Xproto/pCreateColormap/pCreateColormap.m b/xts5/Xproto/pCreateColormap/pCreateColormap.m
index 3775419b..3775419b 100644
--- a/xts5/tset/Xproto/pCreateColormap/pCreateColormap.m
+++ b/xts5/Xproto/pCreateColormap/pCreateColormap.m
diff --git a/xts5/tset/Xproto/pCreateCursor/pCreateCursor.m b/xts5/Xproto/pCreateCursor/pCreateCursor.m
index ebf535a5..ebf535a5 100644
--- a/xts5/tset/Xproto/pCreateCursor/pCreateCursor.m
+++ b/xts5/Xproto/pCreateCursor/pCreateCursor.m
diff --git a/xts5/tset/Xproto/pCreateGC/pCreateGC.m b/xts5/Xproto/pCreateGC/pCreateGC.m
index beeed2b4..beeed2b4 100644
--- a/xts5/tset/Xproto/pCreateGC/pCreateGC.m
+++ b/xts5/Xproto/pCreateGC/pCreateGC.m
diff --git a/xts5/tset/Xproto/pCreateGlyphCursor/pCreateGlyphCursor.m b/xts5/Xproto/pCreateGlyphCursor/pCreateGlyphCursor.m
index 29b0bd8e..29b0bd8e 100644
--- a/xts5/tset/Xproto/pCreateGlyphCursor/pCreateGlyphCursor.m
+++ b/xts5/Xproto/pCreateGlyphCursor/pCreateGlyphCursor.m
diff --git a/xts5/tset/Xproto/pCreatePixmap/pCreatePixmap.m b/xts5/Xproto/pCreatePixmap/pCreatePixmap.m
index b8440a37..b8440a37 100644
--- a/xts5/tset/Xproto/pCreatePixmap/pCreatePixmap.m
+++ b/xts5/Xproto/pCreatePixmap/pCreatePixmap.m
diff --git a/xts5/tset/Xproto/pCreateWindow/pCreateWindow.m b/xts5/Xproto/pCreateWindow/pCreateWindow.m
index 3164af5f..3164af5f 100644
--- a/xts5/tset/Xproto/pCreateWindow/pCreateWindow.m
+++ b/xts5/Xproto/pCreateWindow/pCreateWindow.m
diff --git a/xts5/tset/Xproto/pDeleteProperty/pDeleteProperty.m b/xts5/Xproto/pDeleteProperty/pDeleteProperty.m
index eb470af7..eb470af7 100644
--- a/xts5/tset/Xproto/pDeleteProperty/pDeleteProperty.m
+++ b/xts5/Xproto/pDeleteProperty/pDeleteProperty.m
diff --git a/xts5/tset/Xproto/pDestroySubwindows/pDestroySubwindows.m b/xts5/Xproto/pDestroySubwindows/pDestroySubwindows.m
index c2ced1b8..c2ced1b8 100644
--- a/xts5/tset/Xproto/pDestroySubwindows/pDestroySubwindows.m
+++ b/xts5/Xproto/pDestroySubwindows/pDestroySubwindows.m
diff --git a/xts5/tset/Xproto/pDestroyWindow/pDestroyWindow.m b/xts5/Xproto/pDestroyWindow/pDestroyWindow.m
index 9e34c444..9e34c444 100644
--- a/xts5/tset/Xproto/pDestroyWindow/pDestroyWindow.m
+++ b/xts5/Xproto/pDestroyWindow/pDestroyWindow.m
diff --git a/xts5/tset/Xproto/pFillPoly/pFillPoly.m b/xts5/Xproto/pFillPoly/pFillPoly.m
index 42d784fa..42d784fa 100644
--- a/xts5/tset/Xproto/pFillPoly/pFillPoly.m
+++ b/xts5/Xproto/pFillPoly/pFillPoly.m
diff --git a/xts5/tset/Xproto/pForceScreenSaver/pForceScreenSaver.m b/xts5/Xproto/pForceScreenSaver/pForceScreenSaver.m
index 14b1ea30..14b1ea30 100644
--- a/xts5/tset/Xproto/pForceScreenSaver/pForceScreenSaver.m
+++ b/xts5/Xproto/pForceScreenSaver/pForceScreenSaver.m
diff --git a/xts5/tset/Xproto/pFreeColormap/pFreeColormap.m b/xts5/Xproto/pFreeColormap/pFreeColormap.m
index 6a6296dd..6a6296dd 100644
--- a/xts5/tset/Xproto/pFreeColormap/pFreeColormap.m
+++ b/xts5/Xproto/pFreeColormap/pFreeColormap.m
diff --git a/xts5/tset/Xproto/pFreeColors/pFreeColors.m b/xts5/Xproto/pFreeColors/pFreeColors.m
index 8286d9a8..8286d9a8 100644
--- a/xts5/tset/Xproto/pFreeColors/pFreeColors.m
+++ b/xts5/Xproto/pFreeColors/pFreeColors.m
diff --git a/xts5/tset/Xproto/pFreeCursor/pFreeCursor.m b/xts5/Xproto/pFreeCursor/pFreeCursor.m
index 5fd5d279..5fd5d279 100644
--- a/xts5/tset/Xproto/pFreeCursor/pFreeCursor.m
+++ b/xts5/Xproto/pFreeCursor/pFreeCursor.m
diff --git a/xts5/tset/Xproto/pFreeGC/pFreeGC.m b/xts5/Xproto/pFreeGC/pFreeGC.m
index 083da14c..083da14c 100644
--- a/xts5/tset/Xproto/pFreeGC/pFreeGC.m
+++ b/xts5/Xproto/pFreeGC/pFreeGC.m
diff --git a/xts5/tset/Xproto/pFreePixmap/pFreePixmap.m b/xts5/Xproto/pFreePixmap/pFreePixmap.m
index 4fbee113..4fbee113 100644
--- a/xts5/tset/Xproto/pFreePixmap/pFreePixmap.m
+++ b/xts5/Xproto/pFreePixmap/pFreePixmap.m
diff --git a/xts5/tset/Xproto/pGetAtomName/pGetAtomName.m b/xts5/Xproto/pGetAtomName/pGetAtomName.m
index f7d6d7c3..f7d6d7c3 100644
--- a/xts5/tset/Xproto/pGetAtomName/pGetAtomName.m
+++ b/xts5/Xproto/pGetAtomName/pGetAtomName.m
diff --git a/xts5/tset/Xproto/pGetFontPath/pGetFontPath.m b/xts5/Xproto/pGetFontPath/pGetFontPath.m
index ed10553b..ed10553b 100644
--- a/xts5/tset/Xproto/pGetFontPath/pGetFontPath.m
+++ b/xts5/Xproto/pGetFontPath/pGetFontPath.m
diff --git a/xts5/tset/Xproto/pGetGeometry/pGetGeometry.m b/xts5/Xproto/pGetGeometry/pGetGeometry.m
index 63d28257..63d28257 100644
--- a/xts5/tset/Xproto/pGetGeometry/pGetGeometry.m
+++ b/xts5/Xproto/pGetGeometry/pGetGeometry.m
diff --git a/xts5/tset/Xproto/pGetImage/pGetImage.m b/xts5/Xproto/pGetImage/pGetImage.m
index 28ce0937..28ce0937 100644
--- a/xts5/tset/Xproto/pGetImage/pGetImage.m
+++ b/xts5/Xproto/pGetImage/pGetImage.m
diff --git a/xts5/tset/Xproto/pGetInputFocus/pGetInputFocus.m b/xts5/Xproto/pGetInputFocus/pGetInputFocus.m
index 57bb97c9..57bb97c9 100644
--- a/xts5/tset/Xproto/pGetInputFocus/pGetInputFocus.m
+++ b/xts5/Xproto/pGetInputFocus/pGetInputFocus.m
diff --git a/xts5/tset/Xproto/pGetKeyboardControl/pGetKeyboardControl.m b/xts5/Xproto/pGetKeyboardControl/pGetKeyboardControl.m
index 124b8833..124b8833 100644
--- a/xts5/tset/Xproto/pGetKeyboardControl/pGetKeyboardControl.m
+++ b/xts5/Xproto/pGetKeyboardControl/pGetKeyboardControl.m
diff --git a/xts5/tset/Xproto/pGetKeyboardMapping/pGetKeyboardMapping.m b/xts5/Xproto/pGetKeyboardMapping/pGetKeyboardMapping.m
index 34f0301c..34f0301c 100644
--- a/xts5/tset/Xproto/pGetKeyboardMapping/pGetKeyboardMapping.m
+++ b/xts5/Xproto/pGetKeyboardMapping/pGetKeyboardMapping.m
diff --git a/xts5/tset/Xproto/pGetModifierMapping/pGetModifierMapping.m b/xts5/Xproto/pGetModifierMapping/pGetModifierMapping.m
index 0ff1cc6f..0ff1cc6f 100644
--- a/xts5/tset/Xproto/pGetModifierMapping/pGetModifierMapping.m
+++ b/xts5/Xproto/pGetModifierMapping/pGetModifierMapping.m
diff --git a/xts5/tset/Xproto/pGetMotionEvents/pGetMotionEvents.m b/xts5/Xproto/pGetMotionEvents/pGetMotionEvents.m
index 17ef6663..17ef6663 100644
--- a/xts5/tset/Xproto/pGetMotionEvents/pGetMotionEvents.m
+++ b/xts5/Xproto/pGetMotionEvents/pGetMotionEvents.m
diff --git a/xts5/tset/Xproto/pGetPointerControl/pGetPointerControl.m b/xts5/Xproto/pGetPointerControl/pGetPointerControl.m
index 163ae95c..163ae95c 100644
--- a/xts5/tset/Xproto/pGetPointerControl/pGetPointerControl.m
+++ b/xts5/Xproto/pGetPointerControl/pGetPointerControl.m
diff --git a/xts5/tset/Xproto/pGetPointerMapping/pGetPointerMapping.m b/xts5/Xproto/pGetPointerMapping/pGetPointerMapping.m
index e7184ed1..e7184ed1 100644
--- a/xts5/tset/Xproto/pGetPointerMapping/pGetPointerMapping.m
+++ b/xts5/Xproto/pGetPointerMapping/pGetPointerMapping.m
diff --git a/xts5/tset/Xproto/pGetProperty/pGetProperty.m b/xts5/Xproto/pGetProperty/pGetProperty.m
index 6d8d657a..6d8d657a 100644
--- a/xts5/tset/Xproto/pGetProperty/pGetProperty.m
+++ b/xts5/Xproto/pGetProperty/pGetProperty.m
diff --git a/xts5/tset/Xproto/pGetScreenSaver/pGetScreenSaver.m b/xts5/Xproto/pGetScreenSaver/pGetScreenSaver.m
index 65d9401d..65d9401d 100644
--- a/xts5/tset/Xproto/pGetScreenSaver/pGetScreenSaver.m
+++ b/xts5/Xproto/pGetScreenSaver/pGetScreenSaver.m
diff --git a/xts5/tset/Xproto/pGetSelectionOwner/pGetSelectionOwner.m b/xts5/Xproto/pGetSelectionOwner/pGetSelectionOwner.m
index 2dc1be77..2dc1be77 100644
--- a/xts5/tset/Xproto/pGetSelectionOwner/pGetSelectionOwner.m
+++ b/xts5/Xproto/pGetSelectionOwner/pGetSelectionOwner.m
diff --git a/xts5/tset/Xproto/pGetWindowAttributes/pGetWindowAttributes.m b/xts5/Xproto/pGetWindowAttributes/pGetWindowAttributes.m
index d7999541..d7999541 100644
--- a/xts5/tset/Xproto/pGetWindowAttributes/pGetWindowAttributes.m
+++ b/xts5/Xproto/pGetWindowAttributes/pGetWindowAttributes.m
diff --git a/xts5/tset/Xproto/pGrabButton/pGrabButton.m b/xts5/Xproto/pGrabButton/pGrabButton.m
index d91e0357..d91e0357 100644
--- a/xts5/tset/Xproto/pGrabButton/pGrabButton.m
+++ b/xts5/Xproto/pGrabButton/pGrabButton.m
diff --git a/xts5/tset/Xproto/pGrabKey/pGrabKey.m b/xts5/Xproto/pGrabKey/pGrabKey.m
index f87e9ceb..f87e9ceb 100644
--- a/xts5/tset/Xproto/pGrabKey/pGrabKey.m
+++ b/xts5/Xproto/pGrabKey/pGrabKey.m
diff --git a/xts5/tset/Xproto/pGrabKeyboard/pGrabKeyboard.m b/xts5/Xproto/pGrabKeyboard/pGrabKeyboard.m
index b2bc4db6..b2bc4db6 100644
--- a/xts5/tset/Xproto/pGrabKeyboard/pGrabKeyboard.m
+++ b/xts5/Xproto/pGrabKeyboard/pGrabKeyboard.m
diff --git a/xts5/tset/Xproto/pGrabPointer/pGrabPointer.m b/xts5/Xproto/pGrabPointer/pGrabPointer.m
index 65bb58b8..65bb58b8 100644
--- a/xts5/tset/Xproto/pGrabPointer/pGrabPointer.m
+++ b/xts5/Xproto/pGrabPointer/pGrabPointer.m
diff --git a/xts5/tset/Xproto/pGrabServer/pGrabServer.m b/xts5/Xproto/pGrabServer/pGrabServer.m
index 4e6ec842..4e6ec842 100644
--- a/xts5/tset/Xproto/pGrabServer/pGrabServer.m
+++ b/xts5/Xproto/pGrabServer/pGrabServer.m
diff --git a/xts5/tset/Xproto/pImageText16/pImageText16.m b/xts5/Xproto/pImageText16/pImageText16.m
index 29e0e5c9..29e0e5c9 100644
--- a/xts5/tset/Xproto/pImageText16/pImageText16.m
+++ b/xts5/Xproto/pImageText16/pImageText16.m
diff --git a/xts5/tset/Xproto/pImageText8/pImageText8.m b/xts5/Xproto/pImageText8/pImageText8.m
index 3a100b54..3a100b54 100644
--- a/xts5/tset/Xproto/pImageText8/pImageText8.m
+++ b/xts5/Xproto/pImageText8/pImageText8.m
diff --git a/xts5/tset/Xproto/pInstallColormap/pInstallColormap.m b/xts5/Xproto/pInstallColormap/pInstallColormap.m
index 771f89df..771f89df 100644
--- a/xts5/tset/Xproto/pInstallColormap/pInstallColormap.m
+++ b/xts5/Xproto/pInstallColormap/pInstallColormap.m
diff --git a/xts5/tset/Xproto/pInternAtom/pInternAtom.m b/xts5/Xproto/pInternAtom/pInternAtom.m
index d61e2c7c..d61e2c7c 100644
--- a/xts5/tset/Xproto/pInternAtom/pInternAtom.m
+++ b/xts5/Xproto/pInternAtom/pInternAtom.m
diff --git a/xts5/tset/Xproto/pKillClient/pKillClient.m b/xts5/Xproto/pKillClient/pKillClient.m
index 6bad55fd..6bad55fd 100644
--- a/xts5/tset/Xproto/pKillClient/pKillClient.m
+++ b/xts5/Xproto/pKillClient/pKillClient.m
diff --git a/xts5/tset/Xproto/pListExtensions/pListExtensions.m b/xts5/Xproto/pListExtensions/pListExtensions.m
index 48198eb4..48198eb4 100644
--- a/xts5/tset/Xproto/pListExtensions/pListExtensions.m
+++ b/xts5/Xproto/pListExtensions/pListExtensions.m
diff --git a/xts5/tset/Xproto/pListFonts/pListFonts.m b/xts5/Xproto/pListFonts/pListFonts.m
index bc24c1fa..bc24c1fa 100644
--- a/xts5/tset/Xproto/pListFonts/pListFonts.m
+++ b/xts5/Xproto/pListFonts/pListFonts.m
diff --git a/xts5/tset/Xproto/pListFontsWithInfo/pListFontsWithInfo.m b/xts5/Xproto/pListFontsWithInfo/pListFontsWithInfo.m
index 0c7fc10b..0c7fc10b 100644
--- a/xts5/tset/Xproto/pListFontsWithInfo/pListFontsWithInfo.m
+++ b/xts5/Xproto/pListFontsWithInfo/pListFontsWithInfo.m
diff --git a/xts5/tset/Xproto/pListHosts/pListHosts.m b/xts5/Xproto/pListHosts/pListHosts.m
index 8797e9ba..8797e9ba 100644
--- a/xts5/tset/Xproto/pListHosts/pListHosts.m
+++ b/xts5/Xproto/pListHosts/pListHosts.m
diff --git a/xts5/tset/Xproto/pListInstalledColormaps/pListInstalledColormaps.m b/xts5/Xproto/pListInstalledColormaps/pListInstalledColormaps.m
index 2aa5196b..2aa5196b 100644
--- a/xts5/tset/Xproto/pListInstalledColormaps/pListInstalledColormaps.m
+++ b/xts5/Xproto/pListInstalledColormaps/pListInstalledColormaps.m
diff --git a/xts5/tset/Xproto/pListProperties/pListProperties.m b/xts5/Xproto/pListProperties/pListProperties.m
index 2e9ea034..2e9ea034 100644
--- a/xts5/tset/Xproto/pListProperties/pListProperties.m
+++ b/xts5/Xproto/pListProperties/pListProperties.m
diff --git a/xts5/tset/Xproto/pLookupColor/pLookupColor.m b/xts5/Xproto/pLookupColor/pLookupColor.m
index 4ecf8404..4ecf8404 100644
--- a/xts5/tset/Xproto/pLookupColor/pLookupColor.m
+++ b/xts5/Xproto/pLookupColor/pLookupColor.m
diff --git a/xts5/tset/Xproto/pMapSubwindows/pMapSubwindows.m b/xts5/Xproto/pMapSubwindows/pMapSubwindows.m
index b361d7ce..b361d7ce 100644
--- a/xts5/tset/Xproto/pMapSubwindows/pMapSubwindows.m
+++ b/xts5/Xproto/pMapSubwindows/pMapSubwindows.m
diff --git a/xts5/tset/Xproto/pMapWindow/pMapWindow.m b/xts5/Xproto/pMapWindow/pMapWindow.m
index c85239e5..c85239e5 100644
--- a/xts5/tset/Xproto/pMapWindow/pMapWindow.m
+++ b/xts5/Xproto/pMapWindow/pMapWindow.m
diff --git a/xts5/tset/Xproto/pNoOperation/pNoOperation.m b/xts5/Xproto/pNoOperation/pNoOperation.m
index 28dca8cd..28dca8cd 100644
--- a/xts5/tset/Xproto/pNoOperation/pNoOperation.m
+++ b/xts5/Xproto/pNoOperation/pNoOperation.m
diff --git a/xts5/tset/Xproto/pOpenDisplay/pOpenDisplay.m b/xts5/Xproto/pOpenDisplay/pOpenDisplay.m
index a94dce48..a94dce48 100644
--- a/xts5/tset/Xproto/pOpenDisplay/pOpenDisplay.m
+++ b/xts5/Xproto/pOpenDisplay/pOpenDisplay.m
diff --git a/xts5/tset/Xproto/pOpenFont/pOpenFont.m b/xts5/Xproto/pOpenFont/pOpenFont.m
index 7c9aa496..7c9aa496 100644
--- a/xts5/tset/Xproto/pOpenFont/pOpenFont.m
+++ b/xts5/Xproto/pOpenFont/pOpenFont.m
diff --git a/xts5/tset/Xproto/pPolyArc/pPolyArc.m b/xts5/Xproto/pPolyArc/pPolyArc.m
index 9be88563..9be88563 100644
--- a/xts5/tset/Xproto/pPolyArc/pPolyArc.m
+++ b/xts5/Xproto/pPolyArc/pPolyArc.m
diff --git a/xts5/tset/Xproto/pPolyFillArc/pPolyFillArc.m b/xts5/Xproto/pPolyFillArc/pPolyFillArc.m
index bc77e0e9..bc77e0e9 100644
--- a/xts5/tset/Xproto/pPolyFillArc/pPolyFillArc.m
+++ b/xts5/Xproto/pPolyFillArc/pPolyFillArc.m
diff --git a/xts5/tset/Xproto/pPolyFillRectangle/pPolyFillRectangle.m b/xts5/Xproto/pPolyFillRectangle/pPolyFillRectangle.m
index 8e517bbf..8e517bbf 100644
--- a/xts5/tset/Xproto/pPolyFillRectangle/pPolyFillRectangle.m
+++ b/xts5/Xproto/pPolyFillRectangle/pPolyFillRectangle.m
diff --git a/xts5/tset/Xproto/pPolyLine/pPolyLine.m b/xts5/Xproto/pPolyLine/pPolyLine.m
index 094e0427..094e0427 100644
--- a/xts5/tset/Xproto/pPolyLine/pPolyLine.m
+++ b/xts5/Xproto/pPolyLine/pPolyLine.m
diff --git a/xts5/tset/Xproto/pPolyPoint/pPolyPoint.m b/xts5/Xproto/pPolyPoint/pPolyPoint.m
index e3527a5b..e3527a5b 100644
--- a/xts5/tset/Xproto/pPolyPoint/pPolyPoint.m
+++ b/xts5/Xproto/pPolyPoint/pPolyPoint.m
diff --git a/xts5/tset/Xproto/pPolyRectangle/pPolyRectangle.m b/xts5/Xproto/pPolyRectangle/pPolyRectangle.m
index 9197c217..9197c217 100644
--- a/xts5/tset/Xproto/pPolyRectangle/pPolyRectangle.m
+++ b/xts5/Xproto/pPolyRectangle/pPolyRectangle.m
diff --git a/xts5/tset/Xproto/pPolySegment/pPolySegment.m b/xts5/Xproto/pPolySegment/pPolySegment.m
index cc550d58..cc550d58 100644
--- a/xts5/tset/Xproto/pPolySegment/pPolySegment.m
+++ b/xts5/Xproto/pPolySegment/pPolySegment.m
diff --git a/xts5/tset/Xproto/pPolyText16/pPolyText16.m b/xts5/Xproto/pPolyText16/pPolyText16.m
index b06e6d00..b06e6d00 100644
--- a/xts5/tset/Xproto/pPolyText16/pPolyText16.m
+++ b/xts5/Xproto/pPolyText16/pPolyText16.m
diff --git a/xts5/tset/Xproto/pPolyText8/pPolyText8.m b/xts5/Xproto/pPolyText8/pPolyText8.m
index 90b31167..90b31167 100644
--- a/xts5/tset/Xproto/pPolyText8/pPolyText8.m
+++ b/xts5/Xproto/pPolyText8/pPolyText8.m
diff --git a/xts5/tset/Xproto/pPutImage/pPutImage.m b/xts5/Xproto/pPutImage/pPutImage.m
index 36110c30..36110c30 100644
--- a/xts5/tset/Xproto/pPutImage/pPutImage.m
+++ b/xts5/Xproto/pPutImage/pPutImage.m
diff --git a/xts5/tset/Xproto/pQueryBestSize/pQueryBestSize.m b/xts5/Xproto/pQueryBestSize/pQueryBestSize.m
index 478cf4a9..478cf4a9 100644
--- a/xts5/tset/Xproto/pQueryBestSize/pQueryBestSize.m
+++ b/xts5/Xproto/pQueryBestSize/pQueryBestSize.m
diff --git a/xts5/tset/Xproto/pQueryColors/pQueryColors.m b/xts5/Xproto/pQueryColors/pQueryColors.m
index 0ccafdf8..0ccafdf8 100644
--- a/xts5/tset/Xproto/pQueryColors/pQueryColors.m
+++ b/xts5/Xproto/pQueryColors/pQueryColors.m
diff --git a/xts5/tset/Xproto/pQueryExtension/pQueryExtension.m b/xts5/Xproto/pQueryExtension/pQueryExtension.m
index 70cad750..70cad750 100644
--- a/xts5/tset/Xproto/pQueryExtension/pQueryExtension.m
+++ b/xts5/Xproto/pQueryExtension/pQueryExtension.m
diff --git a/xts5/tset/Xproto/pQueryFont/pQueryFont.m b/xts5/Xproto/pQueryFont/pQueryFont.m
index e9a4f49d..e9a4f49d 100644
--- a/xts5/tset/Xproto/pQueryFont/pQueryFont.m
+++ b/xts5/Xproto/pQueryFont/pQueryFont.m
diff --git a/xts5/tset/Xproto/pQueryKeymap/pQueryKeymap.m b/xts5/Xproto/pQueryKeymap/pQueryKeymap.m
index 0da2da7e..0da2da7e 100644
--- a/xts5/tset/Xproto/pQueryKeymap/pQueryKeymap.m
+++ b/xts5/Xproto/pQueryKeymap/pQueryKeymap.m
diff --git a/xts5/tset/Xproto/pQueryPointer/pQueryPointer.m b/xts5/Xproto/pQueryPointer/pQueryPointer.m
index 0232168b..0232168b 100644
--- a/xts5/tset/Xproto/pQueryPointer/pQueryPointer.m
+++ b/xts5/Xproto/pQueryPointer/pQueryPointer.m
diff --git a/xts5/tset/Xproto/pQueryTextExtents/pQueryTextExtents.m b/xts5/Xproto/pQueryTextExtents/pQueryTextExtents.m
index a79f3147..a79f3147 100644
--- a/xts5/tset/Xproto/pQueryTextExtents/pQueryTextExtents.m
+++ b/xts5/Xproto/pQueryTextExtents/pQueryTextExtents.m
diff --git a/xts5/tset/Xproto/pQueryTree/pQueryTree.m b/xts5/Xproto/pQueryTree/pQueryTree.m
index 683e01fe..683e01fe 100644
--- a/xts5/tset/Xproto/pQueryTree/pQueryTree.m
+++ b/xts5/Xproto/pQueryTree/pQueryTree.m
diff --git a/xts5/tset/Xproto/pRecolorCursor/pRecolorCursor.m b/xts5/Xproto/pRecolorCursor/pRecolorCursor.m
index bf840c9d..bf840c9d 100644
--- a/xts5/tset/Xproto/pRecolorCursor/pRecolorCursor.m
+++ b/xts5/Xproto/pRecolorCursor/pRecolorCursor.m
diff --git a/xts5/tset/Xproto/pReparentWindow/pReparentWindow.m b/xts5/Xproto/pReparentWindow/pReparentWindow.m
index 1b826b39..1b826b39 100644
--- a/xts5/tset/Xproto/pReparentWindow/pReparentWindow.m
+++ b/xts5/Xproto/pReparentWindow/pReparentWindow.m
diff --git a/xts5/tset/Xproto/pRotateProperties/pRotateProperties.m b/xts5/Xproto/pRotateProperties/pRotateProperties.m
index 2085f7ef..2085f7ef 100644
--- a/xts5/tset/Xproto/pRotateProperties/pRotateProperties.m
+++ b/xts5/Xproto/pRotateProperties/pRotateProperties.m
diff --git a/xts5/tset/Xproto/pSendEvent/pSendEvent.m b/xts5/Xproto/pSendEvent/pSendEvent.m
index 173b45b1..173b45b1 100644
--- a/xts5/tset/Xproto/pSendEvent/pSendEvent.m
+++ b/xts5/Xproto/pSendEvent/pSendEvent.m
diff --git a/xts5/tset/Xproto/pSetAccessControl/pSetAccessControl.m b/xts5/Xproto/pSetAccessControl/pSetAccessControl.m
index 2e7c7861..2e7c7861 100644
--- a/xts5/tset/Xproto/pSetAccessControl/pSetAccessControl.m
+++ b/xts5/Xproto/pSetAccessControl/pSetAccessControl.m
diff --git a/xts5/tset/Xproto/pSetClipRectangles/pSetClipRectangles.m b/xts5/Xproto/pSetClipRectangles/pSetClipRectangles.m
index e31908ef..e31908ef 100644
--- a/xts5/tset/Xproto/pSetClipRectangles/pSetClipRectangles.m
+++ b/xts5/Xproto/pSetClipRectangles/pSetClipRectangles.m
diff --git a/xts5/tset/Xproto/pSetCloseDownMode/pSetCloseDownMode.m b/xts5/Xproto/pSetCloseDownMode/pSetCloseDownMode.m
index 12206278..12206278 100644
--- a/xts5/tset/Xproto/pSetCloseDownMode/pSetCloseDownMode.m
+++ b/xts5/Xproto/pSetCloseDownMode/pSetCloseDownMode.m
diff --git a/xts5/tset/Xproto/pSetDashes/pSetDashes.m b/xts5/Xproto/pSetDashes/pSetDashes.m
index a6657e40..a6657e40 100644
--- a/xts5/tset/Xproto/pSetDashes/pSetDashes.m
+++ b/xts5/Xproto/pSetDashes/pSetDashes.m
diff --git a/xts5/tset/Xproto/pSetFontPath/pSetFontPath.m b/xts5/Xproto/pSetFontPath/pSetFontPath.m
index a7d8666e..a7d8666e 100644
--- a/xts5/tset/Xproto/pSetFontPath/pSetFontPath.m
+++ b/xts5/Xproto/pSetFontPath/pSetFontPath.m
diff --git a/xts5/tset/Xproto/pSetInputFocus/pSetInputFocus.m b/xts5/Xproto/pSetInputFocus/pSetInputFocus.m
index baab259e..baab259e 100644
--- a/xts5/tset/Xproto/pSetInputFocus/pSetInputFocus.m
+++ b/xts5/Xproto/pSetInputFocus/pSetInputFocus.m
diff --git a/xts5/tset/Xproto/pSetModifierMapping/pSetModifierMapping.m b/xts5/Xproto/pSetModifierMapping/pSetModifierMapping.m
index acaeba6a..acaeba6a 100644
--- a/xts5/tset/Xproto/pSetModifierMapping/pSetModifierMapping.m
+++ b/xts5/Xproto/pSetModifierMapping/pSetModifierMapping.m
diff --git a/xts5/tset/Xproto/pSetPointerMapping/pSetPointerMapping.m b/xts5/Xproto/pSetPointerMapping/pSetPointerMapping.m
index 2f1bf69e..2f1bf69e 100644
--- a/xts5/tset/Xproto/pSetPointerMapping/pSetPointerMapping.m
+++ b/xts5/Xproto/pSetPointerMapping/pSetPointerMapping.m
diff --git a/xts5/tset/Xproto/pSetScreenSaver/pSetScreenSaver.m b/xts5/Xproto/pSetScreenSaver/pSetScreenSaver.m
index b68bba3d..b68bba3d 100644
--- a/xts5/tset/Xproto/pSetScreenSaver/pSetScreenSaver.m
+++ b/xts5/Xproto/pSetScreenSaver/pSetScreenSaver.m
diff --git a/xts5/tset/Xproto/pSetSelectionOwner/pSetSelectionOwner.m b/xts5/Xproto/pSetSelectionOwner/pSetSelectionOwner.m
index c83c311b..c83c311b 100644
--- a/xts5/tset/Xproto/pSetSelectionOwner/pSetSelectionOwner.m
+++ b/xts5/Xproto/pSetSelectionOwner/pSetSelectionOwner.m
diff --git a/xts5/tset/Xproto/pStoreColors/pStoreColors.m b/xts5/Xproto/pStoreColors/pStoreColors.m
index d8425866..d8425866 100644
--- a/xts5/tset/Xproto/pStoreColors/pStoreColors.m
+++ b/xts5/Xproto/pStoreColors/pStoreColors.m
diff --git a/xts5/tset/Xproto/pStoreNamedColor/pStoreNamedColor.m b/xts5/Xproto/pStoreNamedColor/pStoreNamedColor.m
index 8064d87e..8064d87e 100644
--- a/xts5/tset/Xproto/pStoreNamedColor/pStoreNamedColor.m
+++ b/xts5/Xproto/pStoreNamedColor/pStoreNamedColor.m
diff --git a/xts5/tset/Xproto/pTranslateCoords/pTranslateCoords.m b/xts5/Xproto/pTranslateCoords/pTranslateCoords.m
index 82c048ea..82c048ea 100644
--- a/xts5/tset/Xproto/pTranslateCoords/pTranslateCoords.m
+++ b/xts5/Xproto/pTranslateCoords/pTranslateCoords.m
diff --git a/xts5/tset/Xproto/pUngrabButton/pUngrabButton.m b/xts5/Xproto/pUngrabButton/pUngrabButton.m
index 8fea7815..8fea7815 100644
--- a/xts5/tset/Xproto/pUngrabButton/pUngrabButton.m
+++ b/xts5/Xproto/pUngrabButton/pUngrabButton.m
diff --git a/xts5/tset/Xproto/pUngrabKey/pUngrabKey.m b/xts5/Xproto/pUngrabKey/pUngrabKey.m
index ca547d56..ca547d56 100644
--- a/xts5/tset/Xproto/pUngrabKey/pUngrabKey.m
+++ b/xts5/Xproto/pUngrabKey/pUngrabKey.m
diff --git a/xts5/tset/Xproto/pUngrabKeyboard/pUngrabKeyboard.m b/xts5/Xproto/pUngrabKeyboard/pUngrabKeyboard.m
index 0a669310..0a669310 100644
--- a/xts5/tset/Xproto/pUngrabKeyboard/pUngrabKeyboard.m
+++ b/xts5/Xproto/pUngrabKeyboard/pUngrabKeyboard.m
diff --git a/xts5/tset/Xproto/pUngrabPointer/pUngrabPointer.m b/xts5/Xproto/pUngrabPointer/pUngrabPointer.m
index 04033611..04033611 100644
--- a/xts5/tset/Xproto/pUngrabPointer/pUngrabPointer.m
+++ b/xts5/Xproto/pUngrabPointer/pUngrabPointer.m
diff --git a/xts5/tset/Xproto/pUngrabServer/pUngrabServer.m b/xts5/Xproto/pUngrabServer/pUngrabServer.m
index 1eb1405e..1eb1405e 100644
--- a/xts5/tset/Xproto/pUngrabServer/pUngrabServer.m
+++ b/xts5/Xproto/pUngrabServer/pUngrabServer.m
diff --git a/xts5/tset/Xproto/pUninstallColormap/pUninstallColormap.m b/xts5/Xproto/pUninstallColormap/pUninstallColormap.m
index 01983fe8..01983fe8 100644
--- a/xts5/tset/Xproto/pUninstallColormap/pUninstallColormap.m
+++ b/xts5/Xproto/pUninstallColormap/pUninstallColormap.m
diff --git a/xts5/tset/Xproto/pUnmapSubwindows/pUnmapSubwindows.m b/xts5/Xproto/pUnmapSubwindows/pUnmapSubwindows.m
index cc9ece83..cc9ece83 100644
--- a/xts5/tset/Xproto/pUnmapSubwindows/pUnmapSubwindows.m
+++ b/xts5/Xproto/pUnmapSubwindows/pUnmapSubwindows.m
diff --git a/xts5/tset/Xproto/pUnmapWindow/pUnmapWindow.m b/xts5/Xproto/pUnmapWindow/pUnmapWindow.m
index d5fd8069..d5fd8069 100644
--- a/xts5/tset/Xproto/pUnmapWindow/pUnmapWindow.m
+++ b/xts5/Xproto/pUnmapWindow/pUnmapWindow.m
diff --git a/xts5/tset/Xproto/pWarpPointer/pWarpPointer.m b/xts5/Xproto/pWarpPointer/pWarpPointer.m
index 06b9504d..06b9504d 100644
--- a/xts5/tset/Xproto/pWarpPointer/pWarpPointer.m
+++ b/xts5/Xproto/pWarpPointer/pWarpPointer.m
diff --git a/xts5/tset/Xt10/XtAddCallback/XtAddCallback.m b/xts5/Xt10/XtAddCallback/XtAddCallback.m
index 4c9dfab9..4c9dfab9 100644
--- a/xts5/tset/Xt10/XtAddCallback/XtAddCallback.m
+++ b/xts5/Xt10/XtAddCallback/XtAddCallback.m
diff --git a/xts5/tset/Xt10/XtAddCallbacks/XtAddCallbacks.m b/xts5/Xt10/XtAddCallbacks/XtAddCallbacks.m
index c1021a5e..c1021a5e 100644
--- a/xts5/tset/Xt10/XtAddCallbacks/XtAddCallbacks.m
+++ b/xts5/Xt10/XtAddCallbacks/XtAddCallbacks.m
diff --git a/xts5/tset/Xt10/XtCallCallbackList/XtCallCallbackList.m b/xts5/Xt10/XtCallCallbackList/XtCallCallbackList.m
index 0e1fab9e..0e1fab9e 100644
--- a/xts5/tset/Xt10/XtCallCallbackList/XtCallCallbackList.m
+++ b/xts5/Xt10/XtCallCallbackList/XtCallCallbackList.m
diff --git a/xts5/tset/Xt10/XtCallCallbacks/XtCallCallbacks.m b/xts5/Xt10/XtCallCallbacks/XtCallCallbacks.m
index d66d5f73..d66d5f73 100644
--- a/xts5/tset/Xt10/XtCallCallbacks/XtCallCallbacks.m
+++ b/xts5/Xt10/XtCallCallbacks/XtCallCallbacks.m
diff --git a/xts5/tset/Xt10/XtHasCallbacks/XtHasCallbacks.m b/xts5/Xt10/XtHasCallbacks/XtHasCallbacks.m
index 09680a05..09680a05 100644
--- a/xts5/tset/Xt10/XtHasCallbacks/XtHasCallbacks.m
+++ b/xts5/Xt10/XtHasCallbacks/XtHasCallbacks.m
diff --git a/xts5/tset/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks.m b/xts5/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks.m
index 42b8e6b1..42b8e6b1 100644
--- a/xts5/tset/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks.m
+++ b/xts5/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks.m
diff --git a/xts5/tset/Xt10/XtRemoveCallback/XtRemoveCallback.m b/xts5/Xt10/XtRemoveCallback/XtRemoveCallback.m
index 0a2b77b8..0a2b77b8 100644
--- a/xts5/tset/Xt10/XtRemoveCallback/XtRemoveCallback.m
+++ b/xts5/Xt10/XtRemoveCallback/XtRemoveCallback.m
diff --git a/xts5/tset/Xt10/XtRemoveCallbacks/XtRemoveCallbacks.m b/xts5/Xt10/XtRemoveCallbacks/XtRemoveCallbacks.m
index 03263f2c..03263f2c 100644
--- a/xts5/tset/Xt10/XtRemoveCallbacks/XtRemoveCallbacks.m
+++ b/xts5/Xt10/XtRemoveCallbacks/XtRemoveCallbacks.m
diff --git a/xts5/tset/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs.m b/xts5/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs.m
index 73cd8bed..73cd8bed 100644
--- a/xts5/tset/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs.m
+++ b/xts5/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs.m
diff --git a/xts5/tset/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter.m b/xts5/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter.m
index 0fdaba38..0fdaba38 100644
--- a/xts5/tset/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter.m
+++ b/xts5/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter.m
diff --git a/xts5/tset/Xt11/XtCallConverter/XtCallConverter.m b/xts5/Xt11/XtCallConverter/XtCallConverter.m
index 8b2bccf4..8b2bccf4 100644
--- a/xts5/tset/Xt11/XtCallConverter/XtCallConverter.m
+++ b/xts5/Xt11/XtCallConverter/XtCallConverter.m
diff --git a/xts5/tset/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef.m b/xts5/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef.m
index 0d9ef6c9..0d9ef6c9 100644
--- a/xts5/tset/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef.m
+++ b/xts5/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef.m
diff --git a/xts5/tset/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList.m b/xts5/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList.m
index 40215bb8..40215bb8 100644
--- a/xts5/tset/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList.m
+++ b/xts5/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList.m
diff --git a/xts5/tset/Xt11/XtConvertAndStore/XtConvertAndStore.m b/xts5/Xt11/XtConvertAndStore/XtConvertAndStore.m
index a8bd4c5d..a8bd4c5d 100644
--- a/xts5/tset/Xt11/XtConvertAndStore/XtConvertAndStore.m
+++ b/xts5/Xt11/XtConvertAndStore/XtConvertAndStore.m
diff --git a/xts5/tset/Xt11/XtCvtColorToPixel/XtCvtColorToPixel.m b/xts5/Xt11/XtCvtColorToPixel/XtCvtColorToPixel.m
index 2b7211cb..2b7211cb 100644
--- a/xts5/tset/Xt11/XtCvtColorToPixel/XtCvtColorToPixel.m
+++ b/xts5/Xt11/XtCvtColorToPixel/XtCvtColorToPixel.m
diff --git a/xts5/tset/Xt11/XtCvtIntToBool/XtCvtIntToBool.m b/xts5/Xt11/XtCvtIntToBool/XtCvtIntToBool.m
index 153d3edb..153d3edb 100644
--- a/xts5/tset/Xt11/XtCvtIntToBool/XtCvtIntToBool.m
+++ b/xts5/Xt11/XtCvtIntToBool/XtCvtIntToBool.m
diff --git a/xts5/tset/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean.m b/xts5/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean.m
index c0d9106a..c0d9106a 100644
--- a/xts5/tset/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean.m
+++ b/xts5/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean.m
diff --git a/xts5/tset/Xt11/XtCvtIntToColor/XtCvtIntToColor.m b/xts5/Xt11/XtCvtIntToColor/XtCvtIntToColor.m
index d2d65bd5..d2d65bd5 100644
--- a/xts5/tset/Xt11/XtCvtIntToColor/XtCvtIntToColor.m
+++ b/xts5/Xt11/XtCvtIntToColor/XtCvtIntToColor.m
diff --git a/xts5/tset/Xt11/XtCvtIntToDimension/XtCvtIntToDimension.m b/xts5/Xt11/XtCvtIntToDimension/XtCvtIntToDimension.m
index 51aaa43b..51aaa43b 100644
--- a/xts5/tset/Xt11/XtCvtIntToDimension/XtCvtIntToDimension.m
+++ b/xts5/Xt11/XtCvtIntToDimension/XtCvtIntToDimension.m
diff --git a/xts5/tset/Xt11/XtCvtIntToFloat/XtCvtIntToFloat.m b/xts5/Xt11/XtCvtIntToFloat/XtCvtIntToFloat.m
index 33d88d1c..33d88d1c 100644
--- a/xts5/tset/Xt11/XtCvtIntToFloat/XtCvtIntToFloat.m
+++ b/xts5/Xt11/XtCvtIntToFloat/XtCvtIntToFloat.m
diff --git a/xts5/tset/Xt11/XtCvtIntToFont/XtCvtIntToFont.m b/xts5/Xt11/XtCvtIntToFont/XtCvtIntToFont.m
index 495dfb18..495dfb18 100644
--- a/xts5/tset/Xt11/XtCvtIntToFont/XtCvtIntToFont.m
+++ b/xts5/Xt11/XtCvtIntToFont/XtCvtIntToFont.m
diff --git a/xts5/tset/Xt11/XtCvtIntToPixel/XtCvtIntToPixel.m b/xts5/Xt11/XtCvtIntToPixel/XtCvtIntToPixel.m
index 68a34033..68a34033 100644
--- a/xts5/tset/Xt11/XtCvtIntToPixel/XtCvtIntToPixel.m
+++ b/xts5/Xt11/XtCvtIntToPixel/XtCvtIntToPixel.m
diff --git a/xts5/tset/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap.m b/xts5/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap.m
index ef6e1231..ef6e1231 100644
--- a/xts5/tset/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap.m
+++ b/xts5/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap.m
diff --git a/xts5/tset/Xt11/XtCvtIntToPosition/XtCvtIntToPosition.m b/xts5/Xt11/XtCvtIntToPosition/XtCvtIntToPosition.m
index e93cb630..e93cb630 100644
--- a/xts5/tset/Xt11/XtCvtIntToPosition/XtCvtIntToPosition.m
+++ b/xts5/Xt11/XtCvtIntToPosition/XtCvtIntToPosition.m
diff --git a/xts5/tset/Xt11/XtCvtIntToShort/XtCvtIntToShort.m b/xts5/Xt11/XtCvtIntToShort/XtCvtIntToShort.m
index 5b213ab3..5b213ab3 100644
--- a/xts5/tset/Xt11/XtCvtIntToShort/XtCvtIntToShort.m
+++ b/xts5/Xt11/XtCvtIntToShort/XtCvtIntToShort.m
diff --git a/xts5/tset/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar.m b/xts5/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar.m
index 4bac7202..4bac7202 100644
--- a/xts5/tset/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar.m
+++ b/xts5/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar.m
diff --git a/xts5/tset/Xt11/XtCvtPixelToColor/XtCvtPixelToColor.m b/xts5/Xt11/XtCvtPixelToColor/XtCvtPixelToColor.m
index 144a5cbf..144a5cbf 100644
--- a/xts5/tset/Xt11/XtCvtPixelToColor/XtCvtPixelToColor.m
+++ b/xts5/Xt11/XtCvtPixelToColor/XtCvtPixelToColor.m
diff --git a/xts5/tset/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable.m b/xts5/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable.m
index f692fdd1..f692fdd1 100644
--- a/xts5/tset/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable.m
+++ b/xts5/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable.m
diff --git a/xts5/tset/Xt11/XtCvtStringToAtom/XtCvtStringToAtom.m b/xts5/Xt11/XtCvtStringToAtom/XtCvtStringToAtom.m
index 595ad9d6..595ad9d6 100644
--- a/xts5/tset/Xt11/XtCvtStringToAtom/XtCvtStringToAtom.m
+++ b/xts5/Xt11/XtCvtStringToAtom/XtCvtStringToAtom.m
diff --git a/xts5/tset/Xt11/XtCvtStringToBool/XtCvtStringToBool.m b/xts5/Xt11/XtCvtStringToBool/XtCvtStringToBool.m
index 55dc1fd0..55dc1fd0 100644
--- a/xts5/tset/Xt11/XtCvtStringToBool/XtCvtStringToBool.m
+++ b/xts5/Xt11/XtCvtStringToBool/XtCvtStringToBool.m
diff --git a/xts5/tset/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean.m b/xts5/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean.m
index 1a9202a7..1a9202a7 100644
--- a/xts5/tset/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean.m
+++ b/xts5/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean.m
diff --git a/xts5/tset/Xt11/XtCvtStringToCursor/XtCvtStringToCursor.m b/xts5/Xt11/XtCvtStringToCursor/XtCvtStringToCursor.m
index 6fa7e318..6fa7e318 100644
--- a/xts5/tset/Xt11/XtCvtStringToCursor/XtCvtStringToCursor.m
+++ b/xts5/Xt11/XtCvtStringToCursor/XtCvtStringToCursor.m
diff --git a/xts5/tset/Xt11/XtCvtStringToDimension/XtCvtStringToDimension.m b/xts5/Xt11/XtCvtStringToDimension/XtCvtStringToDimension.m
index 272d61f1..272d61f1 100644
--- a/xts5/tset/Xt11/XtCvtStringToDimension/XtCvtStringToDimension.m
+++ b/xts5/Xt11/XtCvtStringToDimension/XtCvtStringToDimension.m
diff --git a/xts5/tset/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay.m b/xts5/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay.m
index d35e752f..d35e752f 100644
--- a/xts5/tset/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay.m
+++ b/xts5/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay.m
diff --git a/xts5/tset/Xt11/XtCvtStringToFile/XtCvtStringToFile.m b/xts5/Xt11/XtCvtStringToFile/XtCvtStringToFile.m
index ae8d1e60..ae8d1e60 100644
--- a/xts5/tset/Xt11/XtCvtStringToFile/XtCvtStringToFile.m
+++ b/xts5/Xt11/XtCvtStringToFile/XtCvtStringToFile.m
diff --git a/xts5/tset/Xt11/XtCvtStringToFloat/XtCvtStringToFloat.m b/xts5/Xt11/XtCvtStringToFloat/XtCvtStringToFloat.m
index afb20ef2..afb20ef2 100644
--- a/xts5/tset/Xt11/XtCvtStringToFloat/XtCvtStringToFloat.m
+++ b/xts5/Xt11/XtCvtStringToFloat/XtCvtStringToFloat.m
diff --git a/xts5/tset/Xt11/XtCvtStringToFont/XtCvtStringToFont.m b/xts5/Xt11/XtCvtStringToFont/XtCvtStringToFont.m
index 756dc773..756dc773 100644
--- a/xts5/tset/Xt11/XtCvtStringToFont/XtCvtStringToFont.m
+++ b/xts5/Xt11/XtCvtStringToFont/XtCvtStringToFont.m
diff --git a/xts5/tset/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet.m b/xts5/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet.m
index 4c3cd72c..4c3cd72c 100644
--- a/xts5/tset/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet.m
+++ b/xts5/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet.m
diff --git a/xts5/tset/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct.m b/xts5/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct.m
index 7015ae0a..7015ae0a 100644
--- a/xts5/tset/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct.m
+++ b/xts5/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct.m
diff --git a/xts5/tset/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState.m b/xts5/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState.m
index 681d2e49..681d2e49 100644
--- a/xts5/tset/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState.m
+++ b/xts5/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState.m
diff --git a/xts5/tset/Xt11/XtCvtStringToInt/XtCvtStringToInt.m b/xts5/Xt11/XtCvtStringToInt/XtCvtStringToInt.m
index 048f821c..048f821c 100644
--- a/xts5/tset/Xt11/XtCvtStringToInt/XtCvtStringToInt.m
+++ b/xts5/Xt11/XtCvtStringToInt/XtCvtStringToInt.m
diff --git a/xts5/tset/Xt11/XtCvtStringToPixel/XtCvtStringToPixel.m b/xts5/Xt11/XtCvtStringToPixel/XtCvtStringToPixel.m
index 0c6c9886..0c6c9886 100644
--- a/xts5/tset/Xt11/XtCvtStringToPixel/XtCvtStringToPixel.m
+++ b/xts5/Xt11/XtCvtStringToPixel/XtCvtStringToPixel.m
diff --git a/xts5/tset/Xt11/XtCvtStringToPosition/XtCvtStringToPosition.m b/xts5/Xt11/XtCvtStringToPosition/XtCvtStringToPosition.m
index 9658f50a..9658f50a 100644
--- a/xts5/tset/Xt11/XtCvtStringToPosition/XtCvtStringToPosition.m
+++ b/xts5/Xt11/XtCvtStringToPosition/XtCvtStringToPosition.m
diff --git a/xts5/tset/Xt11/XtCvtStringToShort/XtCvtStringToShort.m b/xts5/Xt11/XtCvtStringToShort/XtCvtStringToShort.m
index d3e59498..d3e59498 100644
--- a/xts5/tset/Xt11/XtCvtStringToShort/XtCvtStringToShort.m
+++ b/xts5/Xt11/XtCvtStringToShort/XtCvtStringToShort.m
diff --git a/xts5/tset/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable.m b/xts5/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable.m
index be3d8aa0..be3d8aa0 100644
--- a/xts5/tset/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable.m
+++ b/xts5/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable.m
diff --git a/xts5/tset/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar.m b/xts5/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar.m
index 949b934a..949b934a 100644
--- a/xts5/tset/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar.m
+++ b/xts5/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar.m
diff --git a/xts5/tset/Xt11/XtCvtStringToVisual/XtCvtStringToVisual.m b/xts5/Xt11/XtCvtStringToVisual/XtCvtStringToVisual.m
index 55711245..55711245 100644
--- a/xts5/tset/Xt11/XtCvtStringToVisual/XtCvtStringToVisual.m
+++ b/xts5/Xt11/XtCvtStringToVisual/XtCvtStringToVisual.m
diff --git a/xts5/tset/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning.m b/xts5/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning.m
index afa5099a..afa5099a 100644
--- a/xts5/tset/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning.m
+++ b/xts5/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning.m
diff --git a/xts5/tset/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext.m b/xts5/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext.m
index e57c7c92..e57c7c92 100644
--- a/xts5/tset/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext.m
+++ b/xts5/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext.m
diff --git a/xts5/tset/Xt11/XtGetApplicationResources/XtGetApplicationResources.m b/xts5/Xt11/XtGetApplicationResources/XtGetApplicationResources.m
index 6ee11a05..6ee11a05 100644
--- a/xts5/tset/Xt11/XtGetApplicationResources/XtGetApplicationResources.m
+++ b/xts5/Xt11/XtGetApplicationResources/XtGetApplicationResources.m
diff --git a/xts5/tset/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList.m b/xts5/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList.m
index 50eb14c0..50eb14c0 100644
--- a/xts5/tset/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList.m
+++ b/xts5/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList.m
diff --git a/xts5/tset/Xt11/XtGetResourceList/XtGetResourceList.m b/xts5/Xt11/XtGetResourceList/XtGetResourceList.m
index 2ef9094b..2ef9094b 100644
--- a/xts5/tset/Xt11/XtGetResourceList/XtGetResourceList.m
+++ b/xts5/Xt11/XtGetResourceList/XtGetResourceList.m
diff --git a/xts5/tset/Xt11/XtGetSubresources/XtGetSubresources.m b/xts5/Xt11/XtGetSubresources/XtGetSubresources.m
index d1cb0ece..d1cb0ece 100644
--- a/xts5/tset/Xt11/XtGetSubresources/XtGetSubresources.m
+++ b/xts5/Xt11/XtGetSubresources/XtGetSubresources.m
diff --git a/xts5/tset/Xt11/XtGetSubvalues/XtGetSubvalues.m b/xts5/Xt11/XtGetSubvalues/XtGetSubvalues.m
index 05de4b3a..05de4b3a 100644
--- a/xts5/tset/Xt11/XtGetSubvalues/XtGetSubvalues.m
+++ b/xts5/Xt11/XtGetSubvalues/XtGetSubvalues.m
diff --git a/xts5/tset/Xt11/XtGetValues/XtGetValues.m b/xts5/Xt11/XtGetValues/XtGetValues.m
index b57cdf54..b57cdf54 100644
--- a/xts5/tset/Xt11/XtGetValues/XtGetValues.m
+++ b/xts5/Xt11/XtGetValues/XtGetValues.m
diff --git a/xts5/tset/Xt11/XtOffset/XtOffset.m b/xts5/Xt11/XtOffset/XtOffset.m
index c39d5dd4..c39d5dd4 100644
--- a/xts5/tset/Xt11/XtOffset/XtOffset.m
+++ b/xts5/Xt11/XtOffset/XtOffset.m
diff --git a/xts5/tset/Xt11/XtOffsetOf/XtOffsetOf.m b/xts5/Xt11/XtOffsetOf/XtOffsetOf.m
index 8ac92b49..8ac92b49 100644
--- a/xts5/tset/Xt11/XtOffsetOf/XtOffsetOf.m
+++ b/xts5/Xt11/XtOffsetOf/XtOffsetOf.m
diff --git a/xts5/tset/Xt11/XtSetSubvalues/XtSetSubvalues.m b/xts5/Xt11/XtSetSubvalues/XtSetSubvalues.m
index 427d69eb..427d69eb 100644
--- a/xts5/tset/Xt11/XtSetSubvalues/XtSetSubvalues.m
+++ b/xts5/Xt11/XtSetSubvalues/XtSetSubvalues.m
diff --git a/xts5/tset/Xt11/XtSetTypeConverter/XtSetTypeConverter.m b/xts5/Xt11/XtSetTypeConverter/XtSetTypeConverter.m
index 11240cb3..11240cb3 100644
--- a/xts5/tset/Xt11/XtSetTypeConverter/XtSetTypeConverter.m
+++ b/xts5/Xt11/XtSetTypeConverter/XtSetTypeConverter.m
diff --git a/xts5/tset/Xt11/XtSetValues/XtSetValues.m b/xts5/Xt11/XtSetValues/XtSetValues.m
index 2009e1c5..2009e1c5 100644
--- a/xts5/tset/Xt11/XtSetValues/XtSetValues.m
+++ b/xts5/Xt11/XtSetValues/XtSetValues.m
diff --git a/xts5/tset/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources.m b/xts5/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources.m
index 1e082c1f..1e082c1f 100644
--- a/xts5/tset/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources.m
+++ b/xts5/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources.m
diff --git a/xts5/tset/Xt11/XtVaGetSubresources/XtVaGetSubresources.m b/xts5/Xt11/XtVaGetSubresources/XtVaGetSubresources.m
index 3b48db16..3b48db16 100644
--- a/xts5/tset/Xt11/XtVaGetSubresources/XtVaGetSubresources.m
+++ b/xts5/Xt11/XtVaGetSubresources/XtVaGetSubresources.m
diff --git a/xts5/tset/Xt11/XtVaGetSubvalues/XtVaGetSubvalues.m b/xts5/Xt11/XtVaGetSubvalues/XtVaGetSubvalues.m
index 7a502b8d..7a502b8d 100644
--- a/xts5/tset/Xt11/XtVaGetSubvalues/XtVaGetSubvalues.m
+++ b/xts5/Xt11/XtVaGetSubvalues/XtVaGetSubvalues.m
diff --git a/xts5/tset/Xt11/XtVaGetValues/XtVaGetValues.m b/xts5/Xt11/XtVaGetValues/XtVaGetValues.m
index 3fcdfb52..3fcdfb52 100644
--- a/xts5/tset/Xt11/XtVaGetValues/XtVaGetValues.m
+++ b/xts5/Xt11/XtVaGetValues/XtVaGetValues.m
diff --git a/xts5/tset/Xt11/XtVaSetSubvalues/XtVaSetSubvalues.m b/xts5/Xt11/XtVaSetSubvalues/XtVaSetSubvalues.m
index 934dc9c3..934dc9c3 100644
--- a/xts5/tset/Xt11/XtVaSetSubvalues/XtVaSetSubvalues.m
+++ b/xts5/Xt11/XtVaSetSubvalues/XtVaSetSubvalues.m
diff --git a/xts5/tset/Xt11/XtVaSetValues/XtVaSetValues.m b/xts5/Xt11/XtVaSetValues/XtVaSetValues.m
index c216ba05..c216ba05 100644
--- a/xts5/tset/Xt11/XtVaSetValues/XtVaSetValues.m
+++ b/xts5/Xt11/XtVaSetValues/XtVaSetValues.m
diff --git a/xts5/tset/Xt12/XtAppAddActionHook/XtAppAddActionHook.m b/xts5/Xt12/XtAppAddActionHook/XtAppAddActionHook.m
index 830ca411..830ca411 100644
--- a/xts5/tset/Xt12/XtAppAddActionHook/XtAppAddActionHook.m
+++ b/xts5/Xt12/XtAppAddActionHook/XtAppAddActionHook.m
diff --git a/xts5/tset/Xt12/XtAppAddActions/XtAppAddActions.m b/xts5/Xt12/XtAppAddActions/XtAppAddActions.m
index 9d119a76..9d119a76 100644
--- a/xts5/tset/Xt12/XtAppAddActions/XtAppAddActions.m
+++ b/xts5/Xt12/XtAppAddActions/XtAppAddActions.m
diff --git a/xts5/tset/Xt12/XtAugmentTranslations/XtAugmentTranslations.m b/xts5/Xt12/XtAugmentTranslations/XtAugmentTranslations.m
index 854af49c..854af49c 100644
--- a/xts5/tset/Xt12/XtAugmentTranslations/XtAugmentTranslations.m
+++ b/xts5/Xt12/XtAugmentTranslations/XtAugmentTranslations.m
diff --git a/xts5/tset/Xt12/XtCallActionProc/XtCallActionProc.m b/xts5/Xt12/XtCallActionProc/XtCallActionProc.m
index cc497f36..cc497f36 100644
--- a/xts5/tset/Xt12/XtCallActionProc/XtCallActionProc.m
+++ b/xts5/Xt12/XtCallActionProc/XtCallActionProc.m
diff --git a/xts5/tset/Xt12/XtConvertCase/XtConvertCase.m b/xts5/Xt12/XtConvertCase/XtConvertCase.m
index 0e8ba37e..0e8ba37e 100644
--- a/xts5/tset/Xt12/XtConvertCase/XtConvertCase.m
+++ b/xts5/Xt12/XtConvertCase/XtConvertCase.m
diff --git a/xts5/tset/Xt12/XtGetActionKeysym/XtGetActionKeysym.m b/xts5/Xt12/XtGetActionKeysym/XtGetActionKeysym.m
index e75c4cab..e75c4cab 100644
--- a/xts5/tset/Xt12/XtGetActionKeysym/XtGetActionKeysym.m
+++ b/xts5/Xt12/XtGetActionKeysym/XtGetActionKeysym.m
diff --git a/xts5/tset/Xt12/XtGetActionList/XtGetActionList.m b/xts5/Xt12/XtGetActionList/XtGetActionList.m
index 7c43ee8d..7c43ee8d 100644
--- a/xts5/tset/Xt12/XtGetActionList/XtGetActionList.m
+++ b/xts5/Xt12/XtGetActionList/XtGetActionList.m
diff --git a/xts5/tset/Xt12/XtGetKeysymTable/XtGetKeysymTable.m b/xts5/Xt12/XtGetKeysymTable/XtGetKeysymTable.m
index b0f68155..b0f68155 100644
--- a/xts5/tset/Xt12/XtGetKeysymTable/XtGetKeysymTable.m
+++ b/xts5/Xt12/XtGetKeysymTable/XtGetKeysymTable.m
diff --git a/xts5/tset/Xt12/XtGetMultiClickTime/XtGetMultiClickTime.m b/xts5/Xt12/XtGetMultiClickTime/XtGetMultiClickTime.m
index 24198cb7..24198cb7 100644
--- a/xts5/tset/Xt12/XtGetMultiClickTime/XtGetMultiClickTime.m
+++ b/xts5/Xt12/XtGetMultiClickTime/XtGetMultiClickTime.m
diff --git a/xts5/tset/Xt12/XtInstallAccelerators/XtInstallAccelerators.m b/xts5/Xt12/XtInstallAccelerators/XtInstallAccelerators.m
index 37d1f8de..37d1f8de 100644
--- a/xts5/tset/Xt12/XtInstallAccelerators/XtInstallAccelerators.m
+++ b/xts5/Xt12/XtInstallAccelerators/XtInstallAccelerators.m
diff --git a/xts5/tset/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators.m b/xts5/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators.m
index a3fbbaab..a3fbbaab 100644
--- a/xts5/tset/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators.m
+++ b/xts5/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators.m
diff --git a/xts5/tset/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList.m b/xts5/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList.m
index 31e71b29..31e71b29 100644
--- a/xts5/tset/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList.m
+++ b/xts5/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList.m
diff --git a/xts5/tset/Xt12/XtOverrideTranslations/XtOverrideTranslations.m b/xts5/Xt12/XtOverrideTranslations/XtOverrideTranslations.m
index 22985e29..22985e29 100644
--- a/xts5/tset/Xt12/XtOverrideTranslations/XtOverrideTranslations.m
+++ b/xts5/Xt12/XtOverrideTranslations/XtOverrideTranslations.m
diff --git a/xts5/tset/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable.m b/xts5/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable.m
index e1e59ccf..e1e59ccf 100644
--- a/xts5/tset/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable.m
+++ b/xts5/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable.m
diff --git a/xts5/tset/Xt12/XtParseTranslationTable/XtParseTranslationTable.m b/xts5/Xt12/XtParseTranslationTable/XtParseTranslationTable.m
index 07bb8dcb..07bb8dcb 100644
--- a/xts5/tset/Xt12/XtParseTranslationTable/XtParseTranslationTable.m
+++ b/xts5/Xt12/XtParseTranslationTable/XtParseTranslationTable.m
diff --git a/xts5/tset/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter.m b/xts5/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter.m
index e5bb7134..e5bb7134 100644
--- a/xts5/tset/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter.m
+++ b/xts5/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter.m
diff --git a/xts5/tset/Xt12/XtRegisterGrabAction/XtRegisterGrabAction.m b/xts5/Xt12/XtRegisterGrabAction/XtRegisterGrabAction.m
index 5377d065..5377d065 100644
--- a/xts5/tset/Xt12/XtRegisterGrabAction/XtRegisterGrabAction.m
+++ b/xts5/Xt12/XtRegisterGrabAction/XtRegisterGrabAction.m
diff --git a/xts5/tset/Xt12/XtRemoveActionHook/XtRemoveActionHook.m b/xts5/Xt12/XtRemoveActionHook/XtRemoveActionHook.m
index 7cb287eb..7cb287eb 100644
--- a/xts5/tset/Xt12/XtRemoveActionHook/XtRemoveActionHook.m
+++ b/xts5/Xt12/XtRemoveActionHook/XtRemoveActionHook.m
diff --git a/xts5/tset/Xt12/XtSetKeyTranslator/XtSetKeyTranslator.m b/xts5/Xt12/XtSetKeyTranslator/XtSetKeyTranslator.m
index 775e0d6a..775e0d6a 100644
--- a/xts5/tset/Xt12/XtSetKeyTranslator/XtSetKeyTranslator.m
+++ b/xts5/Xt12/XtSetKeyTranslator/XtSetKeyTranslator.m
diff --git a/xts5/tset/Xt12/XtSetMultiClickTime/XtSetMultiClickTime.m b/xts5/Xt12/XtSetMultiClickTime/XtSetMultiClickTime.m
index d64b089a..d64b089a 100644
--- a/xts5/tset/Xt12/XtSetMultiClickTime/XtSetMultiClickTime.m
+++ b/xts5/Xt12/XtSetMultiClickTime/XtSetMultiClickTime.m
diff --git a/xts5/tset/Xt12/XtTranslateKeycode/XtTranslateKeycode.m b/xts5/Xt12/XtTranslateKeycode/XtTranslateKeycode.m
index 1d913967..1d913967 100644
--- a/xts5/tset/Xt12/XtTranslateKeycode/XtTranslateKeycode.m
+++ b/xts5/Xt12/XtTranslateKeycode/XtTranslateKeycode.m
diff --git a/xts5/tset/Xt12/XtUninstallTranslations/XtUninstallTranslations.m b/xts5/Xt12/XtUninstallTranslations/XtUninstallTranslations.m
index 1dc79013..1dc79013 100644
--- a/xts5/tset/Xt12/XtUninstallTranslations/XtUninstallTranslations.m
+++ b/xts5/Xt12/XtUninstallTranslations/XtUninstallTranslations.m
diff --git a/xts5/tset/Xt13/XtAddExposureToRegion/XtAddExposureToRegion.m b/xts5/Xt13/XtAddExposureToRegion/XtAddExposureToRegion.m
index 4dffd67a..4dffd67a 100644
--- a/xts5/tset/Xt13/XtAddExposureToRegion/XtAddExposureToRegion.m
+++ b/xts5/Xt13/XtAddExposureToRegion/XtAddExposureToRegion.m
diff --git a/xts5/tset/Xt13/XtAllocateGC/XtAllocateGC.m b/xts5/Xt13/XtAllocateGC/XtAllocateGC.m
index 82910bdb..82910bdb 100644
--- a/xts5/tset/Xt13/XtAllocateGC/XtAllocateGC.m
+++ b/xts5/Xt13/XtAllocateGC/XtAllocateGC.m
diff --git a/xts5/tset/Xt13/XtAppError/XtAppError.m b/xts5/Xt13/XtAppError/XtAppError.m
index bde7d54f..bde7d54f 100644
--- a/xts5/tset/Xt13/XtAppError/XtAppError.m
+++ b/xts5/Xt13/XtAppError/XtAppError.m
diff --git a/xts5/tset/Xt13/XtAppErrorMsg/XtAppErrorMsg.m b/xts5/Xt13/XtAppErrorMsg/XtAppErrorMsg.m
index e89dbcde..e89dbcde 100644
--- a/xts5/tset/Xt13/XtAppErrorMsg/XtAppErrorMsg.m
+++ b/xts5/Xt13/XtAppErrorMsg/XtAppErrorMsg.m
diff --git a/xts5/tset/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase.m b/xts5/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase.m
index b20cef67..b20cef67 100644
--- a/xts5/tset/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase.m
+++ b/xts5/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase.m
diff --git a/xts5/tset/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText.m b/xts5/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText.m
index fda478e4..fda478e4 100644
--- a/xts5/tset/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText.m
+++ b/xts5/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText.m
diff --git a/xts5/tset/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout.m b/xts5/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout.m
index 85c7c78d..85c7c78d 100644
--- a/xts5/tset/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout.m
+++ b/xts5/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout.m
diff --git a/xts5/tset/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler.m b/xts5/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler.m
index ab39dfb4..ab39dfb4 100644
--- a/xts5/tset/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler.m
+++ b/xts5/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler.m
diff --git a/xts5/tset/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler.m b/xts5/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler.m
index 6f97e9e9..6f97e9e9 100644
--- a/xts5/tset/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler.m
+++ b/xts5/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler.m
diff --git a/xts5/tset/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout.m b/xts5/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout.m
index 8bb85c8d..8bb85c8d 100644
--- a/xts5/tset/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout.m
+++ b/xts5/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout.m
diff --git a/xts5/tset/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler.m b/xts5/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler.m
index ae47f83d..ae47f83d 100644
--- a/xts5/tset/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler.m
+++ b/xts5/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler.m
diff --git a/xts5/tset/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler.m b/xts5/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler.m
index 1a5d69e0..1a5d69e0 100644
--- a/xts5/tset/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler.m
+++ b/xts5/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler.m
diff --git a/xts5/tset/Xt13/XtAppWarning/XtAppWarning.m b/xts5/Xt13/XtAppWarning/XtAppWarning.m
index 9cd577df..9cd577df 100644
--- a/xts5/tset/Xt13/XtAppWarning/XtAppWarning.m
+++ b/xts5/Xt13/XtAppWarning/XtAppWarning.m
diff --git a/xts5/tset/Xt13/XtAppWarningMsg/XtAppWarningMsg.m b/xts5/Xt13/XtAppWarningMsg/XtAppWarningMsg.m
index 857be0f1..857be0f1 100644
--- a/xts5/tset/Xt13/XtAppWarningMsg/XtAppWarningMsg.m
+++ b/xts5/Xt13/XtAppWarningMsg/XtAppWarningMsg.m
diff --git a/xts5/tset/Xt13/XtCalloc/XtCalloc.m b/xts5/Xt13/XtCalloc/XtCalloc.m
index 5ef8aca8..5ef8aca8 100644
--- a/xts5/tset/Xt13/XtCalloc/XtCalloc.m
+++ b/xts5/Xt13/XtCalloc/XtCalloc.m
diff --git a/xts5/tset/Xt13/XtDisownSelection/XtDisownSelection.m b/xts5/Xt13/XtDisownSelection/XtDisownSelection.m
index c68ca706..c68ca706 100644
--- a/xts5/tset/Xt13/XtDisownSelection/XtDisownSelection.m
+++ b/xts5/Xt13/XtDisownSelection/XtDisownSelection.m
diff --git a/xts5/tset/Xt13/XtFindFile/XtFindFile.m b/xts5/Xt13/XtFindFile/XtFindFile.m
index 69409ae4..69409ae4 100644
--- a/xts5/tset/Xt13/XtFindFile/XtFindFile.m
+++ b/xts5/Xt13/XtFindFile/XtFindFile.m
diff --git a/xts5/tset/Xt13/XtFindFile/data1 b/xts5/Xt13/XtFindFile/data1
index 557db03d..557db03d 100644
--- a/xts5/tset/Xt13/XtFindFile/data1
+++ b/xts5/Xt13/XtFindFile/data1
diff --git a/xts5/tset/Xt13/XtFindFile/data3/empty b/xts5/Xt13/XtFindFile/data3/empty
index e69de29b..e69de29b 100644
--- a/xts5/tset/Xt13/XtFindFile/data3/empty
+++ b/xts5/Xt13/XtFindFile/data3/empty
diff --git a/xts5/tset/Xt13/XtFree/XtFree.m b/xts5/Xt13/XtFree/XtFree.m
index 54d05544..54d05544 100644
--- a/xts5/tset/Xt13/XtFree/XtFree.m
+++ b/xts5/Xt13/XtFree/XtFree.m
diff --git a/xts5/tset/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass.m b/xts5/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass.m
index 18da7fec..18da7fec 100644
--- a/xts5/tset/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass.m
+++ b/xts5/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass.m
diff --git a/xts5/tset/Xt13/XtGetGC/XtGetGC.m b/xts5/Xt13/XtGetGC/XtGetGC.m
index 3e61a737..3e61a737 100644
--- a/xts5/tset/Xt13/XtGetGC/XtGetGC.m
+++ b/xts5/Xt13/XtGetGC/XtGetGC.m
diff --git a/xts5/tset/Xt13/XtGetSelectionRequest/XtGetSelectionRequest.m b/xts5/Xt13/XtGetSelectionRequest/XtGetSelectionRequest.m
index 8c66b4d8..8c66b4d8 100644
--- a/xts5/tset/Xt13/XtGetSelectionRequest/XtGetSelectionRequest.m
+++ b/xts5/Xt13/XtGetSelectionRequest/XtGetSelectionRequest.m
diff --git a/xts5/tset/Xt13/XtGetSelectionValue/XtGetSelectionValue.m b/xts5/Xt13/XtGetSelectionValue/XtGetSelectionValue.m
index 1f46bee2..1f46bee2 100644
--- a/xts5/tset/Xt13/XtGetSelectionValue/XtGetSelectionValue.m
+++ b/xts5/Xt13/XtGetSelectionValue/XtGetSelectionValue.m
diff --git a/xts5/tset/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental.m b/xts5/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental.m
index 81be10d1..81be10d1 100644
--- a/xts5/tset/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental.m
+++ b/xts5/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental.m
diff --git a/xts5/tset/Xt13/XtGetSelectionValues/XtGetSelectionValues.m b/xts5/Xt13/XtGetSelectionValues/XtGetSelectionValues.m
index c57494d3..c57494d3 100644
--- a/xts5/tset/Xt13/XtGetSelectionValues/XtGetSelectionValues.m
+++ b/xts5/Xt13/XtGetSelectionValues/XtGetSelectionValues.m
diff --git a/xts5/tset/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental.m b/xts5/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental.m
index 1577c241..1577c241 100644
--- a/xts5/tset/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental.m
+++ b/xts5/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental.m
diff --git a/xts5/tset/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed.m b/xts5/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed.m
index f9c6c99f..f9c6c99f 100644
--- a/xts5/tset/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed.m
+++ b/xts5/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed.m
diff --git a/xts5/tset/Xt13/XtMalloc/XtMalloc.m b/xts5/Xt13/XtMalloc/XtMalloc.m
index 50239682..50239682 100644
--- a/xts5/tset/Xt13/XtMalloc/XtMalloc.m
+++ b/xts5/Xt13/XtMalloc/XtMalloc.m
diff --git a/xts5/tset/Xt13/XtNameToWidget/XtNameToWidget.m b/xts5/Xt13/XtNameToWidget/XtNameToWidget.m
index 7a08cf5f..7a08cf5f 100644
--- a/xts5/tset/Xt13/XtNameToWidget/XtNameToWidget.m
+++ b/xts5/Xt13/XtNameToWidget/XtNameToWidget.m
diff --git a/xts5/tset/Xt13/XtNew/XtNew.m b/xts5/Xt13/XtNew/XtNew.m
index a9c49c96..a9c49c96 100644
--- a/xts5/tset/Xt13/XtNew/XtNew.m
+++ b/xts5/Xt13/XtNew/XtNew.m
diff --git a/xts5/tset/Xt13/XtNewString/XtNewString.m b/xts5/Xt13/XtNewString/XtNewString.m
index 41509b69..41509b69 100644
--- a/xts5/tset/Xt13/XtNewString/XtNewString.m
+++ b/xts5/Xt13/XtNewString/XtNewString.m
diff --git a/xts5/tset/Xt13/XtNumber/XtNumber.m b/xts5/Xt13/XtNumber/XtNumber.m
index d64d229c..d64d229c 100644
--- a/xts5/tset/Xt13/XtNumber/XtNumber.m
+++ b/xts5/Xt13/XtNumber/XtNumber.m
diff --git a/xts5/tset/Xt13/XtOwnSelection/XtOwnSelection.m b/xts5/Xt13/XtOwnSelection/XtOwnSelection.m
index a22fb418..a22fb418 100644
--- a/xts5/tset/Xt13/XtOwnSelection/XtOwnSelection.m
+++ b/xts5/Xt13/XtOwnSelection/XtOwnSelection.m
diff --git a/xts5/tset/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental.m b/xts5/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental.m
index b12f34d4..b12f34d4 100644
--- a/xts5/tset/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental.m
+++ b/xts5/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental.m
diff --git a/xts5/tset/Xt13/XtRealloc/XtRealloc.m b/xts5/Xt13/XtRealloc/XtRealloc.m
index 810abd67..810abd67 100644
--- a/xts5/tset/Xt13/XtRealloc/XtRealloc.m
+++ b/xts5/Xt13/XtRealloc/XtRealloc.m
diff --git a/xts5/tset/Xt13/XtReleaseGC/XtReleaseGC.m b/xts5/Xt13/XtReleaseGC/XtReleaseGC.m
index 0ffe178c..0ffe178c 100644
--- a/xts5/tset/Xt13/XtReleaseGC/XtReleaseGC.m
+++ b/xts5/Xt13/XtReleaseGC/XtReleaseGC.m
diff --git a/xts5/tset/Xt13/XtResolvePathname/XtResolvePathname.m b/xts5/Xt13/XtResolvePathname/XtResolvePathname.m
index a6664ad9..a6664ad9 100644
--- a/xts5/tset/Xt13/XtResolvePathname/XtResolvePathname.m
+++ b/xts5/Xt13/XtResolvePathname/XtResolvePathname.m
diff --git a/xts5/tset/Xt13/XtResolvePathname/data1 b/xts5/Xt13/XtResolvePathname/data1
index e69de29b..e69de29b 100644
--- a/xts5/tset/Xt13/XtResolvePathname/data1
+++ b/xts5/Xt13/XtResolvePathname/data1
diff --git a/xts5/tset/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows.m b/xts5/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows.m
index 081dda79..081dda79 100644
--- a/xts5/tset/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows.m
+++ b/xts5/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows.m
diff --git a/xts5/tset/Xt13/XtTranslateCoords/XtTranslateCoords.m b/xts5/Xt13/XtTranslateCoords/XtTranslateCoords.m
index 686f6ca9..686f6ca9 100644
--- a/xts5/tset/Xt13/XtTranslateCoords/XtTranslateCoords.m
+++ b/xts5/Xt13/XtTranslateCoords/XtTranslateCoords.m
diff --git a/xts5/tset/Xt13/XtWindowToWidget/XtWindowToWidget.m b/xts5/Xt13/XtWindowToWidget/XtWindowToWidget.m
index 0b210c3a..0b210c3a 100644
--- a/xts5/tset/Xt13/XtWindowToWidget/XtWindowToWidget.m
+++ b/xts5/Xt13/XtWindowToWidget/XtWindowToWidget.m
diff --git a/xts5/tset/Xt14/ObjectObject/ObjectObject.m b/xts5/Xt14/ObjectObject/ObjectObject.m
index 31250c5d..31250c5d 100644
--- a/xts5/tset/Xt14/ObjectObject/ObjectObject.m
+++ b/xts5/Xt14/ObjectObject/ObjectObject.m
diff --git a/xts5/tset/Xt14/RectangleObject/RectangleObject.m b/xts5/Xt14/RectangleObject/RectangleObject.m
index 61989979..61989979 100644
--- a/xts5/tset/Xt14/RectangleObject/RectangleObject.m
+++ b/xts5/Xt14/RectangleObject/RectangleObject.m
diff --git a/xts5/tset/Xt15/XtSpecificationRelease/XtSpecificationRelease.m b/xts5/Xt15/XtSpecificationRelease/XtSpecificationRelease.m
index 458eeeaa..458eeeaa 100644
--- a/xts5/tset/Xt15/XtSpecificationRelease/XtSpecificationRelease.m
+++ b/xts5/Xt15/XtSpecificationRelease/XtSpecificationRelease.m
diff --git a/xts5/tset/Xt3/CompositeWidget/CompositeWidget.m b/xts5/Xt3/CompositeWidget/CompositeWidget.m
index 4e6bedcb..4e6bedcb 100644
--- a/xts5/tset/Xt3/CompositeWidget/CompositeWidget.m
+++ b/xts5/Xt3/CompositeWidget/CompositeWidget.m
diff --git a/xts5/tset/Xt3/ConstraintWidget/ConstraintWidget.m b/xts5/Xt3/ConstraintWidget/ConstraintWidget.m
index f6dd0430..f6dd0430 100644
--- a/xts5/tset/Xt3/ConstraintWidget/ConstraintWidget.m
+++ b/xts5/Xt3/ConstraintWidget/ConstraintWidget.m
diff --git a/xts5/tset/Xt3/CoreWidget/CoreWidget.m b/xts5/Xt3/CoreWidget/CoreWidget.m
index 86693fd9..86693fd9 100644
--- a/xts5/tset/Xt3/CoreWidget/CoreWidget.m
+++ b/xts5/Xt3/CoreWidget/CoreWidget.m
diff --git a/xts5/tset/Xt3/DataTypes/DataTypes.m b/xts5/Xt3/DataTypes/DataTypes.m
index 8e8078d0..8e8078d0 100644
--- a/xts5/tset/Xt3/DataTypes/DataTypes.m
+++ b/xts5/Xt3/DataTypes/DataTypes.m
diff --git a/xts5/tset/Xt3/XtCheckSubclass/Test12.c b/xts5/Xt3/XtCheckSubclass/Test12.c
index 950dd037..950dd037 100644
--- a/xts5/tset/Xt3/XtCheckSubclass/Test12.c
+++ b/xts5/Xt3/XtCheckSubclass/Test12.c
diff --git a/xts5/tset/Xt3/XtCheckSubclass/Test3.c b/xts5/Xt3/XtCheckSubclass/Test3.c
index 3ca174a9..3ca174a9 100644
--- a/xts5/tset/Xt3/XtCheckSubclass/Test3.c
+++ b/xts5/Xt3/XtCheckSubclass/Test3.c
diff --git a/xts5/tset/Xt3/XtCheckSubclass/XtCheckSubclass.m b/xts5/Xt3/XtCheckSubclass/XtCheckSubclass.m
index a58c2e97..a58c2e97 100644
--- a/xts5/tset/Xt3/XtCheckSubclass/XtCheckSubclass.m
+++ b/xts5/Xt3/XtCheckSubclass/XtCheckSubclass.m
diff --git a/xts5/tset/Xt3/XtClass/XtClass.m b/xts5/Xt3/XtClass/XtClass.m
index 2cf39bcc..2cf39bcc 100644
--- a/xts5/tset/Xt3/XtClass/XtClass.m
+++ b/xts5/Xt3/XtClass/XtClass.m
diff --git a/xts5/tset/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m b/xts5/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m
index ee9d35cb..ee9d35cb 100644
--- a/xts5/tset/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m
+++ b/xts5/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass.m
diff --git a/xts5/tset/Xt3/XtIsApplicationShell/XtIsApplicationShell.m b/xts5/Xt3/XtIsApplicationShell/XtIsApplicationShell.m
index 559242a8..559242a8 100644
--- a/xts5/tset/Xt3/XtIsApplicationShell/XtIsApplicationShell.m
+++ b/xts5/Xt3/XtIsApplicationShell/XtIsApplicationShell.m
diff --git a/xts5/tset/Xt3/XtIsComposite/XtIsComposite.m b/xts5/Xt3/XtIsComposite/XtIsComposite.m
index 34b5bff6..34b5bff6 100644
--- a/xts5/tset/Xt3/XtIsComposite/XtIsComposite.m
+++ b/xts5/Xt3/XtIsComposite/XtIsComposite.m
diff --git a/xts5/tset/Xt3/XtIsConstraint/XtIsConstraint.m b/xts5/Xt3/XtIsConstraint/XtIsConstraint.m
index ddc8f15d..ddc8f15d 100644
--- a/xts5/tset/Xt3/XtIsConstraint/XtIsConstraint.m
+++ b/xts5/Xt3/XtIsConstraint/XtIsConstraint.m
diff --git a/xts5/tset/Xt3/XtIsObject/XtIsObject.m b/xts5/Xt3/XtIsObject/XtIsObject.m
index 2732a8ff..2732a8ff 100644
--- a/xts5/tset/Xt3/XtIsObject/XtIsObject.m
+++ b/xts5/Xt3/XtIsObject/XtIsObject.m
diff --git a/xts5/tset/Xt3/XtIsOverrideShell/XtIsOverrideShell.m b/xts5/Xt3/XtIsOverrideShell/XtIsOverrideShell.m
index 8214bca3..8214bca3 100644
--- a/xts5/tset/Xt3/XtIsOverrideShell/XtIsOverrideShell.m
+++ b/xts5/Xt3/XtIsOverrideShell/XtIsOverrideShell.m
diff --git a/xts5/tset/Xt3/XtIsRectObject/XtIsRectObject.m b/xts5/Xt3/XtIsRectObject/XtIsRectObject.m
index 071ad8e0..071ad8e0 100644
--- a/xts5/tset/Xt3/XtIsRectObject/XtIsRectObject.m
+++ b/xts5/Xt3/XtIsRectObject/XtIsRectObject.m
diff --git a/xts5/tset/Xt3/XtIsShell/XtIsShell.m b/xts5/Xt3/XtIsShell/XtIsShell.m
index 0ac94edd..0ac94edd 100644
--- a/xts5/tset/Xt3/XtIsShell/XtIsShell.m
+++ b/xts5/Xt3/XtIsShell/XtIsShell.m
diff --git a/xts5/tset/Xt3/XtIsSubclass/XtIsSubclass.m b/xts5/Xt3/XtIsSubclass/XtIsSubclass.m
index 7880da3e..7880da3e 100644
--- a/xts5/tset/Xt3/XtIsSubclass/XtIsSubclass.m
+++ b/xts5/Xt3/XtIsSubclass/XtIsSubclass.m
diff --git a/xts5/tset/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m b/xts5/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m
index 16c07741..16c07741 100644
--- a/xts5/tset/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m
+++ b/xts5/Xt3/XtIsTopLevelShell/XtIsTopLevelShell.m
diff --git a/xts5/tset/Xt3/XtIsTransientShell/XtIsTransientShell.m b/xts5/Xt3/XtIsTransientShell/XtIsTransientShell.m
index 2d26caf4..2d26caf4 100644
--- a/xts5/tset/Xt3/XtIsTransientShell/XtIsTransientShell.m
+++ b/xts5/Xt3/XtIsTransientShell/XtIsTransientShell.m
diff --git a/xts5/tset/Xt3/XtIsVendorShell/XtIsVendorShell.m b/xts5/Xt3/XtIsVendorShell/XtIsVendorShell.m
index d74b5757..d74b5757 100644
--- a/xts5/tset/Xt3/XtIsVendorShell/XtIsVendorShell.m
+++ b/xts5/Xt3/XtIsVendorShell/XtIsVendorShell.m
diff --git a/xts5/tset/Xt3/XtIsWMShell/XtIsWMShell.m b/xts5/Xt3/XtIsWMShell/XtIsWMShell.m
index b058a3e4..b058a3e4 100644
--- a/xts5/tset/Xt3/XtIsWMShell/XtIsWMShell.m
+++ b/xts5/Xt3/XtIsWMShell/XtIsWMShell.m
diff --git a/xts5/tset/Xt3/XtIsWidget/XtIsWidget.m b/xts5/Xt3/XtIsWidget/XtIsWidget.m
index 9e4db769..9e4db769 100644
--- a/xts5/tset/Xt3/XtIsWidget/XtIsWidget.m
+++ b/xts5/Xt3/XtIsWidget/XtIsWidget.m
diff --git a/xts5/tset/Xt3/XtSuperClass/XtSuperClass.m b/xts5/Xt3/XtSuperClass/XtSuperClass.m
index 686c6b1d..686c6b1d 100644
--- a/xts5/tset/Xt3/XtSuperClass/XtSuperClass.m
+++ b/xts5/Xt3/XtSuperClass/XtSuperClass.m
diff --git a/xts5/tset/Xt4/XtAppCreateShell/XtAppCreateShell.m b/xts5/Xt4/XtAppCreateShell/XtAppCreateShell.m
index 320c4002..320c4002 100644
--- a/xts5/tset/Xt4/XtAppCreateShell/XtAppCreateShell.m
+++ b/xts5/Xt4/XtAppCreateShell/XtAppCreateShell.m
diff --git a/xts5/tset/Xt4/XtAppInitialize/XtAppInitialize.m b/xts5/Xt4/XtAppInitialize/XtAppInitialize.m
index a1ab6ee5..a1ab6ee5 100644
--- a/xts5/tset/Xt4/XtAppInitialize/XtAppInitialize.m
+++ b/xts5/Xt4/XtAppInitialize/XtAppInitialize.m
diff --git a/xts5/tset/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m b/xts5/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m
index bed1cf86..bed1cf86 100644
--- a/xts5/tset/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m
+++ b/xts5/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources.m
diff --git a/xts5/tset/Xt4/XtCloseDisplay/XtCloseDisplay.m b/xts5/Xt4/XtCloseDisplay/XtCloseDisplay.m
index 5c021e59..5c021e59 100644
--- a/xts5/tset/Xt4/XtCloseDisplay/XtCloseDisplay.m
+++ b/xts5/Xt4/XtCloseDisplay/XtCloseDisplay.m
diff --git a/xts5/tset/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m b/xts5/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m
index 3f721f0d..3f721f0d 100644
--- a/xts5/tset/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m
+++ b/xts5/Xt4/XtCreateApplicationContext/XtCreateApplicationContext.m
diff --git a/xts5/tset/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m b/xts5/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m
index 54a773f4..54a773f4 100644
--- a/xts5/tset/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m
+++ b/xts5/Xt4/XtCreateVarArgsList/XtCreateVarArgsList.m
diff --git a/xts5/tset/Xt4/XtCreateWidget/XtCreateWidget.m b/xts5/Xt4/XtCreateWidget/XtCreateWidget.m
index add9a05c..add9a05c 100644
--- a/xts5/tset/Xt4/XtCreateWidget/XtCreateWidget.m
+++ b/xts5/Xt4/XtCreateWidget/XtCreateWidget.m
diff --git a/xts5/tset/Xt4/XtCreateWindow/XtCreateWindow.m b/xts5/Xt4/XtCreateWindow/XtCreateWindow.m
index cbe5204e..cbe5204e 100644
--- a/xts5/tset/Xt4/XtCreateWindow/XtCreateWindow.m
+++ b/xts5/Xt4/XtCreateWindow/XtCreateWindow.m
diff --git a/xts5/tset/Xt4/XtDatabase/XtDatabase.m b/xts5/Xt4/XtDatabase/XtDatabase.m
index 0d3af11a..0d3af11a 100644
--- a/xts5/tset/Xt4/XtDatabase/XtDatabase.m
+++ b/xts5/Xt4/XtDatabase/XtDatabase.m
diff --git a/xts5/tset/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m b/xts5/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m
index 105383ea..105383ea 100644
--- a/xts5/tset/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m
+++ b/xts5/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext.m
diff --git a/xts5/tset/Xt4/XtDestroyWidget/XtDestroyWidget.m b/xts5/Xt4/XtDestroyWidget/XtDestroyWidget.m
index 47e0dbc6..47e0dbc6 100644
--- a/xts5/tset/Xt4/XtDestroyWidget/XtDestroyWidget.m
+++ b/xts5/Xt4/XtDestroyWidget/XtDestroyWidget.m
diff --git a/xts5/tset/Xt4/XtDisplay/XtDisplay.m b/xts5/Xt4/XtDisplay/XtDisplay.m
index 975339c1..975339c1 100644
--- a/xts5/tset/Xt4/XtDisplay/XtDisplay.m
+++ b/xts5/Xt4/XtDisplay/XtDisplay.m
diff --git a/xts5/tset/Xt4/XtDisplayInitialize/XtDisplayInitialize.m b/xts5/Xt4/XtDisplayInitialize/XtDisplayInitialize.m
index 3b9ad3bf..3b9ad3bf 100644
--- a/xts5/tset/Xt4/XtDisplayInitialize/XtDisplayInitialize.m
+++ b/xts5/Xt4/XtDisplayInitialize/XtDisplayInitialize.m
diff --git a/xts5/tset/Xt4/XtDisplayOfObject/XtDisplayOfObject.m b/xts5/Xt4/XtDisplayOfObject/XtDisplayOfObject.m
index 82817d90..82817d90 100644
--- a/xts5/tset/Xt4/XtDisplayOfObject/XtDisplayOfObject.m
+++ b/xts5/Xt4/XtDisplayOfObject/XtDisplayOfObject.m
diff --git a/xts5/tset/Xt4/XtIsRealized/XtIsRealized.m b/xts5/Xt4/XtIsRealized/XtIsRealized.m
index 25828488..25828488 100644
--- a/xts5/tset/Xt4/XtIsRealized/XtIsRealized.m
+++ b/xts5/Xt4/XtIsRealized/XtIsRealized.m
diff --git a/xts5/tset/Xt4/XtMergeArgLists/XtMergeArgLists.m b/xts5/Xt4/XtMergeArgLists/XtMergeArgLists.m
index 68a0b75b..68a0b75b 100644
--- a/xts5/tset/Xt4/XtMergeArgLists/XtMergeArgLists.m
+++ b/xts5/Xt4/XtMergeArgLists/XtMergeArgLists.m
diff --git a/xts5/tset/Xt4/XtName/XtName.m b/xts5/Xt4/XtName/XtName.m
index 5c8d6074..5c8d6074 100644
--- a/xts5/tset/Xt4/XtName/XtName.m
+++ b/xts5/Xt4/XtName/XtName.m
diff --git a/xts5/tset/Xt4/XtOpenDisplay/XtOpenDisplay.m b/xts5/Xt4/XtOpenDisplay/XtOpenDisplay.m
index d0383fc1..d0383fc1 100644
--- a/xts5/tset/Xt4/XtOpenDisplay/XtOpenDisplay.m
+++ b/xts5/Xt4/XtOpenDisplay/XtOpenDisplay.m
diff --git a/xts5/tset/Xt4/XtParent/XtParent.m b/xts5/Xt4/XtParent/XtParent.m
index 83e5c7f4..83e5c7f4 100644
--- a/xts5/tset/Xt4/XtParent/XtParent.m
+++ b/xts5/Xt4/XtParent/XtParent.m
diff --git a/xts5/tset/Xt4/XtRealizeWidget/XtRealizeWidget.m b/xts5/Xt4/XtRealizeWidget/XtRealizeWidget.m
index aff34bf7..aff34bf7 100644
--- a/xts5/tset/Xt4/XtRealizeWidget/XtRealizeWidget.m
+++ b/xts5/Xt4/XtRealizeWidget/XtRealizeWidget.m
diff --git a/xts5/tset/Xt4/XtScreen/XtScreen.m b/xts5/Xt4/XtScreen/XtScreen.m
index 7149f6f4..7149f6f4 100644
--- a/xts5/tset/Xt4/XtScreen/XtScreen.m
+++ b/xts5/Xt4/XtScreen/XtScreen.m
diff --git a/xts5/tset/Xt4/XtScreenDatabase/XtScreenDatabase.m b/xts5/Xt4/XtScreenDatabase/XtScreenDatabase.m
index b5386e7f..b5386e7f 100644
--- a/xts5/tset/Xt4/XtScreenDatabase/XtScreenDatabase.m
+++ b/xts5/Xt4/XtScreenDatabase/XtScreenDatabase.m
diff --git a/xts5/tset/Xt4/XtScreenOfObject/XtScreenOfObject.m b/xts5/Xt4/XtScreenOfObject/XtScreenOfObject.m
index 11545c8b..11545c8b 100644
--- a/xts5/tset/Xt4/XtScreenOfObject/XtScreenOfObject.m
+++ b/xts5/Xt4/XtScreenOfObject/XtScreenOfObject.m
diff --git a/xts5/tset/Xt4/XtSetArg/XtSetArg.m b/xts5/Xt4/XtSetArg/XtSetArg.m
index 0121dfa9..0121dfa9 100644
--- a/xts5/tset/Xt4/XtSetArg/XtSetArg.m
+++ b/xts5/Xt4/XtSetArg/XtSetArg.m
diff --git a/xts5/tset/Xt4/XtSetLanguageProc/XtSetLanguageProc.m b/xts5/Xt4/XtSetLanguageProc/XtSetLanguageProc.m
index 65d78ca1..65d78ca1 100644
--- a/xts5/tset/Xt4/XtSetLanguageProc/XtSetLanguageProc.m
+++ b/xts5/Xt4/XtSetLanguageProc/XtSetLanguageProc.m
diff --git a/xts5/tset/Xt4/XtToolkitInitialize/XtToolkitInitialize.m b/xts5/Xt4/XtToolkitInitialize/XtToolkitInitialize.m
index d4cc06be..d4cc06be 100644
--- a/xts5/tset/Xt4/XtToolkitInitialize/XtToolkitInitialize.m
+++ b/xts5/Xt4/XtToolkitInitialize/XtToolkitInitialize.m
diff --git a/xts5/tset/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m b/xts5/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m
index 6e8c9a7f..6e8c9a7f 100644
--- a/xts5/tset/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m
+++ b/xts5/Xt4/XtUnrealizeWidget/XtUnrealizeWidget.m
diff --git a/xts5/tset/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m b/xts5/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m
index dc570573..dc570573 100644
--- a/xts5/tset/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m
+++ b/xts5/Xt4/XtVaAppCreateShell/XtVaAppCreateShell.m
diff --git a/xts5/tset/Xt4/XtVaAppInitialize/XtVaAppInitialize.m b/xts5/Xt4/XtVaAppInitialize/XtVaAppInitialize.m
index e4e6c58c..e4e6c58c 100644
--- a/xts5/tset/Xt4/XtVaAppInitialize/XtVaAppInitialize.m
+++ b/xts5/Xt4/XtVaAppInitialize/XtVaAppInitialize.m
diff --git a/xts5/tset/Xt4/XtVaCreateWidget/XtVaCreateWidget.m b/xts5/Xt4/XtVaCreateWidget/XtVaCreateWidget.m
index f338c291..f338c291 100644
--- a/xts5/tset/Xt4/XtVaCreateWidget/XtVaCreateWidget.m
+++ b/xts5/Xt4/XtVaCreateWidget/XtVaCreateWidget.m
diff --git a/xts5/tset/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m b/xts5/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m
index c486b5b8..c486b5b8 100644
--- a/xts5/tset/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m
+++ b/xts5/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext.m
diff --git a/xts5/tset/Xt4/XtWindow/XtWindow.m b/xts5/Xt4/XtWindow/XtWindow.m
index d23f5583..d23f5583 100644
--- a/xts5/tset/Xt4/XtWindow/XtWindow.m
+++ b/xts5/Xt4/XtWindow/XtWindow.m
diff --git a/xts5/tset/Xt4/XtWindowOfObject/XtWindowOfObject.m b/xts5/Xt4/XtWindowOfObject/XtWindowOfObject.m
index f385336c..f385336c 100644
--- a/xts5/tset/Xt4/XtWindowOfObject/XtWindowOfObject.m
+++ b/xts5/Xt4/XtWindowOfObject/XtWindowOfObject.m
diff --git a/xts5/tset/Xt5/XtCreateManagedWidget/XtCreateManagedWidget.m b/xts5/Xt5/XtCreateManagedWidget/XtCreateManagedWidget.m
index da60128e..da60128e 100644
--- a/xts5/tset/Xt5/XtCreateManagedWidget/XtCreateManagedWidget.m
+++ b/xts5/Xt5/XtCreateManagedWidget/XtCreateManagedWidget.m
diff --git a/xts5/tset/Xt5/XtIsManaged/XtIsManaged.m b/xts5/Xt5/XtIsManaged/XtIsManaged.m
index d879ad4b..d879ad4b 100644
--- a/xts5/tset/Xt5/XtIsManaged/XtIsManaged.m
+++ b/xts5/Xt5/XtIsManaged/XtIsManaged.m
diff --git a/xts5/tset/Xt5/XtManageChild/XtManageChild.m b/xts5/Xt5/XtManageChild/XtManageChild.m
index a2eeae36..a2eeae36 100644
--- a/xts5/tset/Xt5/XtManageChild/XtManageChild.m
+++ b/xts5/Xt5/XtManageChild/XtManageChild.m
diff --git a/xts5/tset/Xt5/XtManageChildren/XtManageChildren.m b/xts5/Xt5/XtManageChildren/XtManageChildren.m
index 08979100..08979100 100644
--- a/xts5/tset/Xt5/XtManageChildren/XtManageChildren.m
+++ b/xts5/Xt5/XtManageChildren/XtManageChildren.m
diff --git a/xts5/tset/Xt5/XtMapWidget/XtMapWidget.m b/xts5/Xt5/XtMapWidget/XtMapWidget.m
index 8dfdbf29..8dfdbf29 100644
--- a/xts5/tset/Xt5/XtMapWidget/XtMapWidget.m
+++ b/xts5/Xt5/XtMapWidget/XtMapWidget.m
diff --git a/xts5/tset/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged.m b/xts5/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged.m
index 3b95c026..3b95c026 100644
--- a/xts5/tset/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged.m
+++ b/xts5/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged.m
diff --git a/xts5/tset/Xt5/XtUnmanageChild/XtUnmanageChild.m b/xts5/Xt5/XtUnmanageChild/XtUnmanageChild.m
index 00210936..00210936 100644
--- a/xts5/tset/Xt5/XtUnmanageChild/XtUnmanageChild.m
+++ b/xts5/Xt5/XtUnmanageChild/XtUnmanageChild.m
diff --git a/xts5/tset/Xt5/XtUnmanageChildren/XtUnmanageChildren.m b/xts5/Xt5/XtUnmanageChildren/XtUnmanageChildren.m
index dd549ed4..dd549ed4 100644
--- a/xts5/tset/Xt5/XtUnmanageChildren/XtUnmanageChildren.m
+++ b/xts5/Xt5/XtUnmanageChildren/XtUnmanageChildren.m
diff --git a/xts5/tset/Xt5/XtUnmapWidget/XtUnmapWidget.m b/xts5/Xt5/XtUnmapWidget/XtUnmapWidget.m
index f1c01c95..f1c01c95 100644
--- a/xts5/tset/Xt5/XtUnmapWidget/XtUnmapWidget.m
+++ b/xts5/Xt5/XtUnmapWidget/XtUnmapWidget.m
diff --git a/xts5/tset/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget.m b/xts5/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget.m
index e4b1cd52..e4b1cd52 100644
--- a/xts5/tset/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget.m
+++ b/xts5/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget.m
diff --git a/xts5/tset/Xt6/ApplicationShellWidget/ApplicationShellWidget.m b/xts5/Xt6/ApplicationShellWidget/ApplicationShellWidget.m
index cf9f9aa4..cf9f9aa4 100644
--- a/xts5/tset/Xt6/ApplicationShellWidget/ApplicationShellWidget.m
+++ b/xts5/Xt6/ApplicationShellWidget/ApplicationShellWidget.m
diff --git a/xts5/tset/Xt6/OverrideShellWidget/OverrideShellWidget.m b/xts5/Xt6/OverrideShellWidget/OverrideShellWidget.m
index 7fb733c1..7fb733c1 100644
--- a/xts5/tset/Xt6/OverrideShellWidget/OverrideShellWidget.m
+++ b/xts5/Xt6/OverrideShellWidget/OverrideShellWidget.m
diff --git a/xts5/tset/Xt6/ShellWidget/ShellWidget.m b/xts5/Xt6/ShellWidget/ShellWidget.m
index 9f2b5d00..9f2b5d00 100644
--- a/xts5/tset/Xt6/ShellWidget/ShellWidget.m
+++ b/xts5/Xt6/ShellWidget/ShellWidget.m
diff --git a/xts5/tset/Xt6/TopLevelShellWidget/TopLevelShellWidget.m b/xts5/Xt6/TopLevelShellWidget/TopLevelShellWidget.m
index 6d98a654..6d98a654 100644
--- a/xts5/tset/Xt6/TopLevelShellWidget/TopLevelShellWidget.m
+++ b/xts5/Xt6/TopLevelShellWidget/TopLevelShellWidget.m
diff --git a/xts5/tset/Xt6/TransientShellWidget/TransientShellWidget.m b/xts5/Xt6/TransientShellWidget/TransientShellWidget.m
index 4f1d08a5..4f1d08a5 100644
--- a/xts5/tset/Xt6/TransientShellWidget/TransientShellWidget.m
+++ b/xts5/Xt6/TransientShellWidget/TransientShellWidget.m
diff --git a/xts5/tset/Xt6/VendorShellWidget/VendorShellWidget.m b/xts5/Xt6/VendorShellWidget/VendorShellWidget.m
index 764438db..764438db 100644
--- a/xts5/tset/Xt6/VendorShellWidget/VendorShellWidget.m
+++ b/xts5/Xt6/VendorShellWidget/VendorShellWidget.m
diff --git a/xts5/tset/Xt6/WMShellWidget/WMShellWidget.m b/xts5/Xt6/WMShellWidget/WMShellWidget.m
index 4f8698f6..4f8698f6 100644
--- a/xts5/tset/Xt6/WMShellWidget/WMShellWidget.m
+++ b/xts5/Xt6/WMShellWidget/WMShellWidget.m
diff --git a/xts5/tset/Xt7/XtCallbackExclusive/XtCallbackExclusive.m b/xts5/Xt7/XtCallbackExclusive/XtCallbackExclusive.m
index 8d6f1618..8d6f1618 100644
--- a/xts5/tset/Xt7/XtCallbackExclusive/XtCallbackExclusive.m
+++ b/xts5/Xt7/XtCallbackExclusive/XtCallbackExclusive.m
diff --git a/xts5/tset/Xt7/XtCallbackNone/XtCallbackNone.m b/xts5/Xt7/XtCallbackNone/XtCallbackNone.m
index a218ca72..a218ca72 100644
--- a/xts5/tset/Xt7/XtCallbackNone/XtCallbackNone.m
+++ b/xts5/Xt7/XtCallbackNone/XtCallbackNone.m
diff --git a/xts5/tset/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m b/xts5/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m
index dc1fe52e..dc1fe52e 100644
--- a/xts5/tset/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m
+++ b/xts5/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive.m
diff --git a/xts5/tset/Xt7/XtCallbackPopdown/XtCallbackPopdown.m b/xts5/Xt7/XtCallbackPopdown/XtCallbackPopdown.m
index 99b21aea..99b21aea 100644
--- a/xts5/tset/Xt7/XtCallbackPopdown/XtCallbackPopdown.m
+++ b/xts5/Xt7/XtCallbackPopdown/XtCallbackPopdown.m
diff --git a/xts5/tset/Xt7/XtCreatePopupShell/XtCreatePopupShell.m b/xts5/Xt7/XtCreatePopupShell/XtCreatePopupShell.m
index 7b057a84..7b057a84 100644
--- a/xts5/tset/Xt7/XtCreatePopupShell/XtCreatePopupShell.m
+++ b/xts5/Xt7/XtCreatePopupShell/XtCreatePopupShell.m
diff --git a/xts5/tset/Xt7/XtMenuPopdown/XtMenuPopdown.m b/xts5/Xt7/XtMenuPopdown/XtMenuPopdown.m
index f6829388..f6829388 100644
--- a/xts5/tset/Xt7/XtMenuPopdown/XtMenuPopdown.m
+++ b/xts5/Xt7/XtMenuPopdown/XtMenuPopdown.m
diff --git a/xts5/tset/Xt7/XtMenuPopup/XtMenuPopup.m b/xts5/Xt7/XtMenuPopup/XtMenuPopup.m
index 0f51335a..0f51335a 100644
--- a/xts5/tset/Xt7/XtMenuPopup/XtMenuPopup.m
+++ b/xts5/Xt7/XtMenuPopup/XtMenuPopup.m
diff --git a/xts5/tset/Xt7/XtPopdown/XtPopdown.m b/xts5/Xt7/XtPopdown/XtPopdown.m
index c921cd81..c921cd81 100644
--- a/xts5/tset/Xt7/XtPopdown/XtPopdown.m
+++ b/xts5/Xt7/XtPopdown/XtPopdown.m
diff --git a/xts5/tset/Xt7/XtPopup/XtPopup.m b/xts5/Xt7/XtPopup/XtPopup.m
index f802e5d8..f802e5d8 100644
--- a/xts5/tset/Xt7/XtPopup/XtPopup.m
+++ b/xts5/Xt7/XtPopup/XtPopup.m
diff --git a/xts5/tset/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m b/xts5/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m
index f8e3d677..f8e3d677 100644
--- a/xts5/tset/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m
+++ b/xts5/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded.m
diff --git a/xts5/tset/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m b/xts5/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m
index 0972b9e0..0972b9e0 100644
--- a/xts5/tset/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m
+++ b/xts5/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell.m
diff --git a/xts5/tset/Xt8/XtConfigureWidget/XtConfigureWidget.m b/xts5/Xt8/XtConfigureWidget/XtConfigureWidget.m
index 3d68df04..3d68df04 100644
--- a/xts5/tset/Xt8/XtConfigureWidget/XtConfigureWidget.m
+++ b/xts5/Xt8/XtConfigureWidget/XtConfigureWidget.m
diff --git a/xts5/tset/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest.m b/xts5/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest.m
index 6f282cb6..6f282cb6 100644
--- a/xts5/tset/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest.m
+++ b/xts5/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest.m
diff --git a/xts5/tset/Xt8/XtMakeResizeRequest/XtMakeResizeRequest.m b/xts5/Xt8/XtMakeResizeRequest/XtMakeResizeRequest.m
index 2a9e9f12..2a9e9f12 100644
--- a/xts5/tset/Xt8/XtMakeResizeRequest/XtMakeResizeRequest.m
+++ b/xts5/Xt8/XtMakeResizeRequest/XtMakeResizeRequest.m
diff --git a/xts5/tset/Xt8/XtMoveWidget/XtMoveWidget.m b/xts5/Xt8/XtMoveWidget/XtMoveWidget.m
index f72e8499..f72e8499 100644
--- a/xts5/tset/Xt8/XtMoveWidget/XtMoveWidget.m
+++ b/xts5/Xt8/XtMoveWidget/XtMoveWidget.m
diff --git a/xts5/tset/Xt8/XtQueryGeometry/XtQueryGeometry.m b/xts5/Xt8/XtQueryGeometry/XtQueryGeometry.m
index bd77aba7..bd77aba7 100644
--- a/xts5/tset/Xt8/XtQueryGeometry/XtQueryGeometry.m
+++ b/xts5/Xt8/XtQueryGeometry/XtQueryGeometry.m
diff --git a/xts5/tset/Xt8/XtQueryGeometry/tqrygomty.c b/xts5/Xt8/XtQueryGeometry/tqrygomty.c
index 3f8713e7..3f8713e7 100644
--- a/xts5/tset/Xt8/XtQueryGeometry/tqrygomty.c
+++ b/xts5/Xt8/XtQueryGeometry/tqrygomty.c
diff --git a/xts5/tset/Xt8/XtResizeWidget/XtResizeWidget.m b/xts5/Xt8/XtResizeWidget/XtResizeWidget.m
index 60443604..60443604 100644
--- a/xts5/tset/Xt8/XtResizeWidget/XtResizeWidget.m
+++ b/xts5/Xt8/XtResizeWidget/XtResizeWidget.m
diff --git a/xts5/tset/Xt8/XtResizeWindow/XtResizeWindow.m b/xts5/Xt8/XtResizeWindow/XtResizeWindow.m
index acc03d75..acc03d75 100644
--- a/xts5/tset/Xt8/XtResizeWindow/XtResizeWindow.m
+++ b/xts5/Xt8/XtResizeWindow/XtResizeWindow.m
diff --git a/xts5/tset/Xt9/XtAddEventHandler/XtAddEventHandler.m b/xts5/Xt9/XtAddEventHandler/XtAddEventHandler.m
index c9782d9d..c9782d9d 100644
--- a/xts5/tset/Xt9/XtAddEventHandler/XtAddEventHandler.m
+++ b/xts5/Xt9/XtAddEventHandler/XtAddEventHandler.m
diff --git a/xts5/tset/Xt9/XtAddGrab/XtAddGrab.m b/xts5/Xt9/XtAddGrab/XtAddGrab.m
index f96145e4..f96145e4 100644
--- a/xts5/tset/Xt9/XtAddGrab/XtAddGrab.m
+++ b/xts5/Xt9/XtAddGrab/XtAddGrab.m
diff --git a/xts5/tset/Xt9/XtAddRawEventHandler/XtAddRawEventHandler.m b/xts5/Xt9/XtAddRawEventHandler/XtAddRawEventHandler.m
index 4865adfb..4865adfb 100644
--- a/xts5/tset/Xt9/XtAddRawEventHandler/XtAddRawEventHandler.m
+++ b/xts5/Xt9/XtAddRawEventHandler/XtAddRawEventHandler.m
diff --git a/xts5/tset/Xt9/XtAppAddInput/XtAppAddInput.m b/xts5/Xt9/XtAppAddInput/XtAppAddInput.m
index 4f6b76fd..4f6b76fd 100644
--- a/xts5/tset/Xt9/XtAppAddInput/XtAppAddInput.m
+++ b/xts5/Xt9/XtAppAddInput/XtAppAddInput.m
diff --git a/xts5/tset/Xt9/XtAppAddTimeOut/XtAppAddTimeOut.m b/xts5/Xt9/XtAppAddTimeOut/XtAppAddTimeOut.m
index 3f0076df..3f0076df 100644
--- a/xts5/tset/Xt9/XtAppAddTimeOut/XtAppAddTimeOut.m
+++ b/xts5/Xt9/XtAppAddTimeOut/XtAppAddTimeOut.m
diff --git a/xts5/tset/Xt9/XtAppAddWorkProc/XtAppAddWorkProc.m b/xts5/Xt9/XtAppAddWorkProc/XtAppAddWorkProc.m
index 2181d1d2..2181d1d2 100644
--- a/xts5/tset/Xt9/XtAppAddWorkProc/XtAppAddWorkProc.m
+++ b/xts5/Xt9/XtAppAddWorkProc/XtAppAddWorkProc.m
diff --git a/xts5/tset/Xt9/XtAppMainLoop/XtAppMainLoop.m b/xts5/Xt9/XtAppMainLoop/XtAppMainLoop.m
index c47b21a7..c47b21a7 100644
--- a/xts5/tset/Xt9/XtAppMainLoop/XtAppMainLoop.m
+++ b/xts5/Xt9/XtAppMainLoop/XtAppMainLoop.m
diff --git a/xts5/tset/Xt9/XtAppNextEvent/XtAppNextEvent.m b/xts5/Xt9/XtAppNextEvent/XtAppNextEvent.m
index c7dede69..c7dede69 100644
--- a/xts5/tset/Xt9/XtAppNextEvent/XtAppNextEvent.m
+++ b/xts5/Xt9/XtAppNextEvent/XtAppNextEvent.m
diff --git a/xts5/tset/Xt9/XtAppPeekEvent/XtAppPeekEvent.m b/xts5/Xt9/XtAppPeekEvent/XtAppPeekEvent.m
index 6b65072b..6b65072b 100644
--- a/xts5/tset/Xt9/XtAppPeekEvent/XtAppPeekEvent.m
+++ b/xts5/Xt9/XtAppPeekEvent/XtAppPeekEvent.m
diff --git a/xts5/tset/Xt9/XtAppPending/XtAppPending.m b/xts5/Xt9/XtAppPending/XtAppPending.m
index 033c0d7d..033c0d7d 100644
--- a/xts5/tset/Xt9/XtAppPending/XtAppPending.m
+++ b/xts5/Xt9/XtAppPending/XtAppPending.m
diff --git a/xts5/tset/Xt9/XtAppProcessEvent/XtAppProcessEvent.m b/xts5/Xt9/XtAppProcessEvent/XtAppProcessEvent.m
index ce505456..ce505456 100644
--- a/xts5/tset/Xt9/XtAppProcessEvent/XtAppProcessEvent.m
+++ b/xts5/Xt9/XtAppProcessEvent/XtAppProcessEvent.m
diff --git a/xts5/tset/Xt9/XtBuildEventMask/XtBuildEventMask.m b/xts5/Xt9/XtBuildEventMask/XtBuildEventMask.m
index 061dcc4c..061dcc4c 100644
--- a/xts5/tset/Xt9/XtBuildEventMask/XtBuildEventMask.m
+++ b/xts5/Xt9/XtBuildEventMask/XtBuildEventMask.m
diff --git a/xts5/tset/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m b/xts5/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m
index d7630211..d7630211 100644
--- a/xts5/tset/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m
+++ b/xts5/Xt9/XtCallAcceptFocus/XtCallAcceptFocus.m
diff --git a/xts5/tset/Xt9/XtCallAcceptFocus/tcalafocs2.c b/xts5/Xt9/XtCallAcceptFocus/tcalafocs2.c
index a705fc43..a705fc43 100644
--- a/xts5/tset/Xt9/XtCallAcceptFocus/tcalafocs2.c
+++ b/xts5/Xt9/XtCallAcceptFocus/tcalafocs2.c
diff --git a/xts5/tset/Xt9/XtDispatchEvent/XtDispatchEvent.m b/xts5/Xt9/XtDispatchEvent/XtDispatchEvent.m
index 9e43eb45..9e43eb45 100644
--- a/xts5/tset/Xt9/XtDispatchEvent/XtDispatchEvent.m
+++ b/xts5/Xt9/XtDispatchEvent/XtDispatchEvent.m
diff --git a/xts5/tset/Xt9/XtGrabButton/XtGrabButton.m b/xts5/Xt9/XtGrabButton/XtGrabButton.m
index 2416d615..2416d615 100644
--- a/xts5/tset/Xt9/XtGrabButton/XtGrabButton.m
+++ b/xts5/Xt9/XtGrabButton/XtGrabButton.m
diff --git a/xts5/tset/Xt9/XtGrabButton/tunbutton/XtGrabButton.m b/xts5/Xt9/XtGrabButton/tunbutton/XtGrabButton.m
index d0a1e46b..d0a1e46b 100644
--- a/xts5/tset/Xt9/XtGrabButton/tunbutton/XtGrabButton.m
+++ b/xts5/Xt9/XtGrabButton/tunbutton/XtGrabButton.m
diff --git a/xts5/tset/Xt9/XtGrabKey/XtGrabKey.m b/xts5/Xt9/XtGrabKey/XtGrabKey.m
index 18e77757..18e77757 100644
--- a/xts5/tset/Xt9/XtGrabKey/XtGrabKey.m
+++ b/xts5/Xt9/XtGrabKey/XtGrabKey.m
diff --git a/xts5/tset/Xt9/XtGrabKeyboard/XtGrabKeyboard.m b/xts5/Xt9/XtGrabKeyboard/XtGrabKeyboard.m
index 901969d3..901969d3 100644
--- a/xts5/tset/Xt9/XtGrabKeyboard/XtGrabKeyboard.m
+++ b/xts5/Xt9/XtGrabKeyboard/XtGrabKeyboard.m
diff --git a/xts5/tset/Xt9/XtGrabPointer/XtGrabPointer.m b/xts5/Xt9/XtGrabPointer/XtGrabPointer.m
index 9a125dff..9a125dff 100644
--- a/xts5/tset/Xt9/XtGrabPointer/XtGrabPointer.m
+++ b/xts5/Xt9/XtGrabPointer/XtGrabPointer.m
diff --git a/xts5/tset/Xt9/XtInsertEventHandler/XtInsertEventHandler.m b/xts5/Xt9/XtInsertEventHandler/XtInsertEventHandler.m
index ea4e2db5..ea4e2db5 100644
--- a/xts5/tset/Xt9/XtInsertEventHandler/XtInsertEventHandler.m
+++ b/xts5/Xt9/XtInsertEventHandler/XtInsertEventHandler.m
diff --git a/xts5/tset/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler.m b/xts5/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler.m
index 06d946c1..06d946c1 100644
--- a/xts5/tset/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler.m
+++ b/xts5/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler.m
diff --git a/xts5/tset/Xt9/XtIsSensitive/XtIsSensitive.m b/xts5/Xt9/XtIsSensitive/XtIsSensitive.m
index 222725c3..222725c3 100644
--- a/xts5/tset/Xt9/XtIsSensitive/XtIsSensitive.m
+++ b/xts5/Xt9/XtIsSensitive/XtIsSensitive.m
diff --git a/xts5/tset/Xt9/XtRemoveEventHandler/XtRemoveEventHandler.m b/xts5/Xt9/XtRemoveEventHandler/XtRemoveEventHandler.m
index 5da7a461..5da7a461 100644
--- a/xts5/tset/Xt9/XtRemoveEventHandler/XtRemoveEventHandler.m
+++ b/xts5/Xt9/XtRemoveEventHandler/XtRemoveEventHandler.m
diff --git a/xts5/tset/Xt9/XtRemoveGrab/XtRemoveGrab.m b/xts5/Xt9/XtRemoveGrab/XtRemoveGrab.m
index 5b5b5e61..5b5b5e61 100644
--- a/xts5/tset/Xt9/XtRemoveGrab/XtRemoveGrab.m
+++ b/xts5/Xt9/XtRemoveGrab/XtRemoveGrab.m
diff --git a/xts5/tset/Xt9/XtRemoveInput/XtRemoveInput.m b/xts5/Xt9/XtRemoveInput/XtRemoveInput.m
index 1ed6782e..1ed6782e 100644
--- a/xts5/tset/Xt9/XtRemoveInput/XtRemoveInput.m
+++ b/xts5/Xt9/XtRemoveInput/XtRemoveInput.m
diff --git a/xts5/tset/Xt9/XtRemoveInput/trminput.dat b/xts5/Xt9/XtRemoveInput/trminput.dat
index 557db03d..557db03d 100644
--- a/xts5/tset/Xt9/XtRemoveInput/trminput.dat
+++ b/xts5/Xt9/XtRemoveInput/trminput.dat
diff --git a/xts5/tset/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler.m b/xts5/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler.m
index 34397792..34397792 100644
--- a/xts5/tset/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler.m
+++ b/xts5/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler.m
diff --git a/xts5/tset/Xt9/XtRemoveTimeOut/XtRemoveTimeOut.m b/xts5/Xt9/XtRemoveTimeOut/XtRemoveTimeOut.m
index fd177ea3..fd177ea3 100644
--- a/xts5/tset/Xt9/XtRemoveTimeOut/XtRemoveTimeOut.m
+++ b/xts5/Xt9/XtRemoveTimeOut/XtRemoveTimeOut.m
diff --git a/xts5/tset/Xt9/XtRemoveWorkProc/XtRemoveWorkProc.m b/xts5/Xt9/XtRemoveWorkProc/XtRemoveWorkProc.m
index b4aea37b..b4aea37b 100644
--- a/xts5/tset/Xt9/XtRemoveWorkProc/XtRemoveWorkProc.m
+++ b/xts5/Xt9/XtRemoveWorkProc/XtRemoveWorkProc.m
diff --git a/xts5/tset/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus.m b/xts5/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus.m
index be191cfe..be191cfe 100644
--- a/xts5/tset/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus.m
+++ b/xts5/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus.m
diff --git a/xts5/tset/Xt9/XtSetSensitive/XtSetSensitive.m b/xts5/Xt9/XtSetSensitive/XtSetSensitive.m
index de70b891..de70b891 100644
--- a/xts5/tset/Xt9/XtSetSensitive/XtSetSensitive.m
+++ b/xts5/Xt9/XtSetSensitive/XtSetSensitive.m
diff --git a/xts5/tset/Xt9/XtUngrabKey/XtUngrabKey.m b/xts5/Xt9/XtUngrabKey/XtUngrabKey.m
index 7fe47ac2..7fe47ac2 100644
--- a/xts5/tset/Xt9/XtUngrabKey/XtUngrabKey.m
+++ b/xts5/Xt9/XtUngrabKey/XtUngrabKey.m
diff --git a/xts5/tset/Xt9/XtUngrabKeyboard/XtUngrabKeyboard.m b/xts5/Xt9/XtUngrabKeyboard/XtUngrabKeyboard.m
index ef729820..ef729820 100644
--- a/xts5/tset/Xt9/XtUngrabKeyboard/XtUngrabKeyboard.m
+++ b/xts5/Xt9/XtUngrabKeyboard/XtUngrabKeyboard.m
diff --git a/xts5/tset/Xt9/XtUngrabPointer/XtUngrabPointer.m b/xts5/Xt9/XtUngrabPointer/XtUngrabPointer.m
index b25227ef..b25227ef 100644
--- a/xts5/tset/Xt9/XtUngrabPointer/XtUngrabPointer.m
+++ b/xts5/Xt9/XtUngrabPointer/XtUngrabPointer.m
diff --git a/xts5/tset/XtC/XtAddActions/XtAddActions.m b/xts5/XtC/XtAddActions/XtAddActions.m
index 8bf79fd8..8bf79fd8 100644
--- a/xts5/tset/XtC/XtAddActions/XtAddActions.m
+++ b/xts5/XtC/XtAddActions/XtAddActions.m
diff --git a/xts5/tset/XtC/XtAddConverter/XtAddConverter.m b/xts5/XtC/XtAddConverter/XtAddConverter.m
index 8ad31ec5..8ad31ec5 100644
--- a/xts5/tset/XtC/XtAddConverter/XtAddConverter.m
+++ b/xts5/XtC/XtAddConverter/XtAddConverter.m
diff --git a/xts5/tset/XtC/XtAddInput/XtAddInput.m b/xts5/XtC/XtAddInput/XtAddInput.m
index 9cea8e4a..9cea8e4a 100644
--- a/xts5/tset/XtC/XtAddInput/XtAddInput.m
+++ b/xts5/XtC/XtAddInput/XtAddInput.m
diff --git a/xts5/tset/XtC/XtAddTimeOut/XtAddTimeOut.m b/xts5/XtC/XtAddTimeOut/XtAddTimeOut.m
index 65d7323d..65d7323d 100644
--- a/xts5/tset/XtC/XtAddTimeOut/XtAddTimeOut.m
+++ b/xts5/XtC/XtAddTimeOut/XtAddTimeOut.m
diff --git a/xts5/tset/XtC/XtAddWorkProc/XtAddWorkProc.m b/xts5/XtC/XtAddWorkProc/XtAddWorkProc.m
index 7765dd80..7765dd80 100644
--- a/xts5/tset/XtC/XtAddWorkProc/XtAddWorkProc.m
+++ b/xts5/XtC/XtAddWorkProc/XtAddWorkProc.m
diff --git a/xts5/tset/XtC/XtAppAddConverter/XtAppAddConverter.m b/xts5/XtC/XtAppAddConverter/XtAppAddConverter.m
index 5638f6a4..5638f6a4 100644
--- a/xts5/tset/XtC/XtAppAddConverter/XtAppAddConverter.m
+++ b/xts5/XtC/XtAppAddConverter/XtAppAddConverter.m
diff --git a/xts5/tset/XtC/XtConvert/XtConvert.m b/xts5/XtC/XtConvert/XtConvert.m
index ab02b958..ab02b958 100644
--- a/xts5/tset/XtC/XtConvert/XtConvert.m
+++ b/xts5/XtC/XtConvert/XtConvert.m
diff --git a/xts5/tset/XtC/XtCreateApplicationShell/XtCreateApplicationShell.m b/xts5/XtC/XtCreateApplicationShell/XtCreateApplicationShell.m
index 5025737e..5025737e 100644
--- a/xts5/tset/XtC/XtCreateApplicationShell/XtCreateApplicationShell.m
+++ b/xts5/XtC/XtCreateApplicationShell/XtCreateApplicationShell.m
diff --git a/xts5/tset/XtC/XtDestroyGC/XtDestroyGC.m b/xts5/XtC/XtDestroyGC/XtDestroyGC.m
index 795e1270..795e1270 100644
--- a/xts5/tset/XtC/XtDestroyGC/XtDestroyGC.m
+++ b/xts5/XtC/XtDestroyGC/XtDestroyGC.m
diff --git a/xts5/tset/XtC/XtDirectConvert/XtDirectConvert.m b/xts5/XtC/XtDirectConvert/XtDirectConvert.m
index db7dcd53..db7dcd53 100644
--- a/xts5/tset/XtC/XtDirectConvert/XtDirectConvert.m
+++ b/xts5/XtC/XtDirectConvert/XtDirectConvert.m
diff --git a/xts5/tset/XtC/XtError/XtError.m b/xts5/XtC/XtError/XtError.m
index 45b5d000..45b5d000 100644
--- a/xts5/tset/XtC/XtError/XtError.m
+++ b/xts5/XtC/XtError/XtError.m
diff --git a/xts5/tset/XtC/XtErrorMsg/XtErrorMsg.m b/xts5/XtC/XtErrorMsg/XtErrorMsg.m
index 05ed1f99..05ed1f99 100644
--- a/xts5/tset/XtC/XtErrorMsg/XtErrorMsg.m
+++ b/xts5/XtC/XtErrorMsg/XtErrorMsg.m
diff --git a/xts5/tset/XtC/XtGetErrorDatabase/XtGetErrorDatabase.m b/xts5/XtC/XtGetErrorDatabase/XtGetErrorDatabase.m
index f6c580f8..f6c580f8 100644
--- a/xts5/tset/XtC/XtGetErrorDatabase/XtGetErrorDatabase.m
+++ b/xts5/XtC/XtGetErrorDatabase/XtGetErrorDatabase.m
diff --git a/xts5/tset/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText.m b/xts5/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText.m
index aa2cb634..aa2cb634 100644
--- a/xts5/tset/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText.m
+++ b/xts5/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText.m
diff --git a/xts5/tset/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout.m b/xts5/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout.m
index 3389f28a..3389f28a 100644
--- a/xts5/tset/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout.m
+++ b/xts5/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout.m
diff --git a/xts5/tset/XtC/XtInitialize/XtInitialize.m b/xts5/XtC/XtInitialize/XtInitialize.m
index f8cc6e57..f8cc6e57 100644
--- a/xts5/tset/XtC/XtInitialize/XtInitialize.m
+++ b/xts5/XtC/XtInitialize/XtInitialize.m
diff --git a/xts5/tset/XtC/XtMainLoop/XtMainLoop.m b/xts5/XtC/XtMainLoop/XtMainLoop.m
index 7b184237..7b184237 100644
--- a/xts5/tset/XtC/XtMainLoop/XtMainLoop.m
+++ b/xts5/XtC/XtMainLoop/XtMainLoop.m
diff --git a/xts5/tset/XtC/XtNextEvent/XtNextEvent.m b/xts5/XtC/XtNextEvent/XtNextEvent.m
index 94661550..94661550 100644
--- a/xts5/tset/XtC/XtNextEvent/XtNextEvent.m
+++ b/xts5/XtC/XtNextEvent/XtNextEvent.m
diff --git a/xts5/tset/XtC/XtPeekEvent/XtPeekEvent.m b/xts5/XtC/XtPeekEvent/XtPeekEvent.m
index 90443970..90443970 100644
--- a/xts5/tset/XtC/XtPeekEvent/XtPeekEvent.m
+++ b/xts5/XtC/XtPeekEvent/XtPeekEvent.m
diff --git a/xts5/tset/XtC/XtPending/XtPending.m b/xts5/XtC/XtPending/XtPending.m
index ece6f05b..ece6f05b 100644
--- a/xts5/tset/XtC/XtPending/XtPending.m
+++ b/xts5/XtC/XtPending/XtPending.m
diff --git a/xts5/tset/XtC/XtProcessEvent/XtProcessEvent.m b/xts5/XtC/XtProcessEvent/XtProcessEvent.m
index 77a16d45..77a16d45 100644
--- a/xts5/tset/XtC/XtProcessEvent/XtProcessEvent.m
+++ b/xts5/XtC/XtProcessEvent/XtProcessEvent.m
diff --git a/xts5/tset/XtC/XtSetErrorHandler/XtSetErrorHandler.m b/xts5/XtC/XtSetErrorHandler/XtSetErrorHandler.m
index 709ccea1..709ccea1 100644
--- a/xts5/tset/XtC/XtSetErrorHandler/XtSetErrorHandler.m
+++ b/xts5/XtC/XtSetErrorHandler/XtSetErrorHandler.m
diff --git a/xts5/tset/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler.m b/xts5/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler.m
index b1694fc5..b1694fc5 100644
--- a/xts5/tset/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler.m
+++ b/xts5/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler.m
diff --git a/xts5/tset/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout.m b/xts5/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout.m
index bb54334b..bb54334b 100644
--- a/xts5/tset/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout.m
+++ b/xts5/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout.m
diff --git a/xts5/tset/XtC/XtSetWarningHandler/XtSetWarningHandler.m b/xts5/XtC/XtSetWarningHandler/XtSetWarningHandler.m
index f6e84449..f6e84449 100644
--- a/xts5/tset/XtC/XtSetWarningHandler/XtSetWarningHandler.m
+++ b/xts5/XtC/XtSetWarningHandler/XtSetWarningHandler.m
diff --git a/xts5/tset/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler.m b/xts5/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler.m
index 5760d598..5760d598 100644
--- a/xts5/tset/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler.m
+++ b/xts5/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler.m
diff --git a/xts5/tset/XtC/XtStringConversionWarning/XtStringConversionWarning.m b/xts5/XtC/XtStringConversionWarning/XtStringConversionWarning.m
index 3bc6129b..3bc6129b 100644
--- a/xts5/tset/XtC/XtStringConversionWarning/XtStringConversionWarning.m
+++ b/xts5/XtC/XtStringConversionWarning/XtStringConversionWarning.m
diff --git a/xts5/tset/XtC/XtWarning/XtWarning.m b/xts5/XtC/XtWarning/XtWarning.m
index d0010d95..d0010d95 100644
--- a/xts5/tset/XtC/XtWarning/XtWarning.m
+++ b/xts5/XtC/XtWarning/XtWarning.m
diff --git a/xts5/tset/XtC/XtWarningMsg/XtWarningMsg.m b/xts5/XtC/XtWarningMsg/XtWarningMsg.m
index 7468c2e1..7468c2e1 100644
--- a/xts5/tset/XtC/XtWarningMsg/XtWarningMsg.m
+++ b/xts5/XtC/XtWarningMsg/XtWarningMsg.m
diff --git a/xts5/tset/XtE/StringDefs.h/StringDefs.h.m b/xts5/XtE/StringDefs.h/StringDefs.h.m
index d65655af..d65655af 100644
--- a/xts5/tset/XtE/StringDefs.h/StringDefs.h.m
+++ b/xts5/XtE/StringDefs.h/StringDefs.h.m
diff --git a/xts5/bin/run_assert b/xts5/bin/run_assert
index 87ac9c3a..9907b1bc 100644
--- a/xts5/bin/run_assert
+++ b/xts5/bin/run_assert
@@ -472,7 +472,7 @@ echo "	\"VSW5TESTSUITE CASE $TestCase 0\"" >>$ScenarioPath
 
 for Assertion in $Assertions
 do
-	echo "	/tset/$TestSection/$TestDirectory/Test{$Assertion}" >>$ScenarioPath
+	echo "	/$TestSection/$TestDirectory/Test{$Assertion}" >>$ScenarioPath
 done
  
 tcc -c -s $ScenarioPath xts5 "$TestCase"
diff --git a/xts5/scenarios/XI_scen b/xts5/scenarios/XI_scen
index 7e6d1534..d9244262 100644
--- a/xts5/scenarios/XI_scen
+++ b/xts5/scenarios/XI_scen
@@ -56,74 +56,74 @@
 #
 
 	"VSW5TESTSUITE CASE XAllowDeviceEvents 22"
-	/tset/XI/AllowDeviceEvents/AllowDeviceEvents
+	/XI/AllowDeviceEvents/AllowDeviceEvents
 	"VSW5TESTSUITE CASE XChangeDeviceControl 10"
-	/tset/XI/ChangeDeviceControl/ChangeDeviceControl
+	/XI/ChangeDeviceControl/ChangeDeviceControl
 	"VSW5TESTSUITE CASE XChangeFeedbackControl 8"
-	/tset/XI/ChangeFeedbackControl/ChangeFeedbackControl
+	/XI/ChangeFeedbackControl/ChangeFeedbackControl
 	"VSW5TESTSUITE CASE XChangeKeyboardDevice 10"
-	/tset/XI/ChangeKeyboardDevice/ChangeKeyboardDevice
+	/XI/ChangeKeyboardDevice/ChangeKeyboardDevice
 	"VSW5TESTSUITE CASE XChangeDeviceDontPropagateList 7"
-	/tset/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList
+	/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList
 	"VSW5TESTSUITE CASE XChangePointerDevice 10"
-	/tset/XI/ChangePointerDevice/ChangePointerDevice
+	/XI/ChangePointerDevice/ChangePointerDevice
 	"VSW5TESTSUITE CASE XChangeDeviceKeyMapping 7"
-	/tset/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping
+	/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping
 	"VSW5TESTSUITE CASE XCloseDevice 7"
-	/tset/XI/CloseDevice/CloseDevice
+	/XI/CloseDevice/CloseDevice
 	"VSW5TESTSUITE CASE XDeviceBell 6"
-	/tset/XI/DeviceBell/DeviceBell
+	/XI/DeviceBell/DeviceBell
 	"VSW5TESTSUITE CASE XGetDeviceControl 4"
-	/tset/XI/XGetDeviceControl/XGetDeviceControl
+	/XI/XGetDeviceControl/XGetDeviceControl
 	"VSW5TESTSUITE CASE XGetFeedbackControl 3"
-	/tset/XI/GetFeedbackControl/GetFeedbackControl
+	/XI/GetFeedbackControl/GetFeedbackControl
 	"VSW5TESTSUITE CASE XGetDeviceFocus 2"
-	/tset/XI/XGetDeviceFocus/XGetDeviceFocus
+	/XI/XGetDeviceFocus/XGetDeviceFocus
 	"VSW5TESTSUITE CASE XGetDeviceDontPropagateList 2"
-	/tset/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList
+	/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList
 	"VSW5TESTSUITE CASE XGetExtensionVersion 2"
-	/tset/XI/GetExtensionVersion/GetExtensionVersion
+	/XI/GetExtensionVersion/GetExtensionVersion
 	"VSW5TESTSUITE CASE XGrabDevice 18"
-	/tset/XI/GrabDevice/GrabDevice
+	/XI/GrabDevice/GrabDevice
 	"VSW5TESTSUITE CASE XGrabDeviceButton 21"
-	/tset/XI/GrabDeviceButton/GrabDeviceButton
+	/XI/GrabDeviceButton/GrabDeviceButton
 	"VSW5TESTSUITE CASE XGrabDeviceKey 21"
-	/tset/XI/GrabDeviceKey/GrabDeviceKey
+	/XI/GrabDeviceKey/GrabDeviceKey
 	"VSW5TESTSUITE CASE XGetDeviceButtonMapping 5"
-	/tset/XI/GetDeviceButtonMapping/GetDeviceButtonMapping
+	/XI/GetDeviceButtonMapping/GetDeviceButtonMapping
 	"VSW5TESTSUITE CASE XGetDeviceKeyMapping 10"
-	/tset/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping
+	/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping
 	"VSW5TESTSUITE CASE XGetDeviceModifierMapping 4"
-	/tset/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping
+	/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping
 	"VSW5TESTSUITE CASE XGetDeviceMotionEvents 9"
-	/tset/XI/GetDeviceMotionEvents/GetDeviceMotionEvents
+	/XI/GetDeviceMotionEvents/GetDeviceMotionEvents
 	"VSW5TESTSUITE CASE XGetSelectedExtensionEvents 2"
-	/tset/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents
+	/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents
 	"VSW5TESTSUITE CASE XListInputDevices 2"
-	/tset/XI/ListInputDevices/ListInputDevices
+	/XI/ListInputDevices/ListInputDevices
 	"VSW5TESTSUITE CASE Miscellaneous 6"
-	/tset/XI/Miscellaneous/Miscellaneous
+	/XI/Miscellaneous/Miscellaneous
 	"VSW5TESTSUITE CASE XOpenDevice 4"
-	/tset/XI/OpenDevice/OpenDevice
+	/XI/OpenDevice/OpenDevice
 	"VSW5TESTSUITE CASE XQueryDeviceState 8"
-	/tset/XI/XQueryDeviceState/XQueryDeviceState
+	/XI/XQueryDeviceState/XQueryDeviceState
 	"VSW5TESTSUITE CASE XSetDeviceValuators 6"
-	/tset/XI/SetDeviceValuators/SetDeviceValuators
+	/XI/SetDeviceValuators/SetDeviceValuators
 	"VSW5TESTSUITE CASE XSetDeviceButtonMapping 8"
-	/tset/XI/SetDeviceButtonMapping/SetDeviceButtonMapping
+	/XI/SetDeviceButtonMapping/SetDeviceButtonMapping
 	"VSW5TESTSUITE CASE XSetDeviceFocus 17"
-	/tset/XI/XSetDeviceFocus/XSetDeviceFocus
+	/XI/XSetDeviceFocus/XSetDeviceFocus
 	"VSW5TESTSUITE CASE XSetDeviceModifierMapping 9"
-	/tset/XI/SetDeviceModifierMapping/SetDeviceModifierMapping
+	/XI/SetDeviceModifierMapping/SetDeviceModifierMapping
 	"VSW5TESTSUITE CASE XSetDeviceMode 6"
-	/tset/XI/SetDeviceMode/SetDeviceMode
+	/XI/SetDeviceMode/SetDeviceMode
 	"VSW5TESTSUITE CASE XSelectExtensionEvent 13"
-	/tset/XI/XSelectExtensionEvent/XSelectExtensionEvent
+	/XI/XSelectExtensionEvent/XSelectExtensionEvent
 	"VSW5TESTSUITE CASE XSendExtensionEvent 20"
-	/tset/XI/SendExtensionEvent/SendExtensionEvent
+	/XI/SendExtensionEvent/SendExtensionEvent
 	"VSW5TESTSUITE CASE XUngrabDevice 4"
-	/tset/XI/XUngrabDevice/XUngrabDevice
+	/XI/XUngrabDevice/XUngrabDevice
 	"VSW5TESTSUITE CASE XUngrabDeviceButton 11"
-	/tset/XI/UngrabDeviceButton/UngrabDeviceButton
+	/XI/UngrabDeviceButton/UngrabDeviceButton
 	"VSW5TESTSUITE CASE XUngrabDeviceKey 12"
-	/tset/XI/UngrabDeviceKey/UngrabDeviceKey
+	/XI/UngrabDeviceKey/UngrabDeviceKey
diff --git a/xts5/scenarios/XIproto_scen b/xts5/scenarios/XIproto_scen
index 21c21938..fc671acf 100644
--- a/xts5/scenarios/XIproto_scen
+++ b/xts5/scenarios/XIproto_scen
@@ -56,72 +56,72 @@
 #
 
 	"VSW5TESTSUITE CASE AllowDeviceEvents 3"
-	/tset/XIproto/AllowDeviceEvents/AllowDeviceEvents
+	/XIproto/AllowDeviceEvents/AllowDeviceEvents
 	"VSW5TESTSUITE CASE ChangeDeviceControl 3"
-	/tset/XIproto/ChangeDeviceControl/ChangeDeviceControl
+	/XIproto/ChangeDeviceControl/ChangeDeviceControl
 	"VSW5TESTSUITE CASE ChangeDeviceDontPropagateList 3"
-	/tset/XIproto/ChangeDeviceDontPropagateList/ChangeDeviceDontPropagateList
+	/XIproto/ChangeDeviceDontPropagateList/ChangeDeviceDontPropagateList
 	"VSW5TESTSUITE CASE ChangeFeedbackControl 3"
-	/tset/XIproto/ChangeFeedbackControl/ChangeFeedbackControl
+	/XIproto/ChangeFeedbackControl/ChangeFeedbackControl
 	"VSW5TESTSUITE CASE ChangeKeyboardDevice 4"
-	/tset/XIproto/ChangeKeyboardDevice/ChangeKeyboardDevice
+	/XIproto/ChangeKeyboardDevice/ChangeKeyboardDevice
 	"VSW5TESTSUITE CASE ChangePointerDevice 4"
-	/tset/XIproto/ChangePointerDevice/ChangePointerDevice
+	/XIproto/ChangePointerDevice/ChangePointerDevice
 	"VSW5TESTSUITE CASE ChangeDeviceKeyMapping 3"
-	/tset/XIproto/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping
+	/XIproto/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping
 	"VSW5TESTSUITE CASE CloseDevice 3"
-	/tset/XIproto/CloseDevice/CloseDevice
+	/XIproto/CloseDevice/CloseDevice
 	"VSW5TESTSUITE CASE DeviceBell 3"
-	/tset/XIproto/DeviceBell/DeviceBell
+	/XIproto/DeviceBell/DeviceBell
 	"VSW5TESTSUITE CASE GetDeviceModifierMapping 3"
-	/tset/XIproto/GetDeviceModifierMapping/GetDeviceModifierMapping
+	/XIproto/GetDeviceModifierMapping/GetDeviceModifierMapping
 	"VSW5TESTSUITE CASE GetFeedbackControl 3"
-	/tset/XIproto/GetFeedbackControl/GetFeedbackControl
+	/XIproto/GetFeedbackControl/GetFeedbackControl
 	"VSW5TESTSUITE CASE GetExtensionVersion 3"
-	/tset/XIproto/GetExtensionVersion/GetExtensionVersion
+	/XIproto/GetExtensionVersion/GetExtensionVersion
 	"VSW5TESTSUITE CASE GrabDevice 3"
-	/tset/XIproto/GrabDevice/GrabDevice
+	/XIproto/GrabDevice/GrabDevice
 	"VSW5TESTSUITE CASE GrabDeviceButton 3"
-	/tset/XIproto/GrabDeviceButton/GrabDeviceButton
+	/XIproto/GrabDeviceButton/GrabDeviceButton
 	"VSW5TESTSUITE CASE GrabDeviceKey 3"
-	/tset/XIproto/GrabDeviceKey/GrabDeviceKey
+	/XIproto/GrabDeviceKey/GrabDeviceKey
 	"VSW5TESTSUITE CASE GetDeviceButtonMapping 3"
-	/tset/XIproto/GetDeviceButtonMapping/GetDeviceButtonMapping
+	/XIproto/GetDeviceButtonMapping/GetDeviceButtonMapping
 	"VSW5TESTSUITE CASE GetDeviceControl 3"
-	/tset/XIproto/GetDeviceControl/GetDeviceControl
+	/XIproto/GetDeviceControl/GetDeviceControl
 	"VSW5TESTSUITE CASE GetDeviceFocus 3"
-	/tset/XIproto/GetDeviceFocus/GetDeviceFocus
+	/XIproto/GetDeviceFocus/GetDeviceFocus
 	"VSW5TESTSUITE CASE GetDeviceMotionEvents 3"
-	/tset/XIproto/GetDeviceMotionEvents/GetDeviceMotionEvents
+	/XIproto/GetDeviceMotionEvents/GetDeviceMotionEvents
 	"VSW5TESTSUITE CASE GetDeviceDontPropagateList 3"
-	/tset/XIproto/GetDeviceDontPropagateList/GetDeviceDontPropagateList
+	/XIproto/GetDeviceDontPropagateList/GetDeviceDontPropagateList
 	"VSW5TESTSUITE CASE GetDeviceKeyMapping 3"
-	/tset/XIproto/GetDeviceKeyMapping/GetDeviceKeyMapping
+	/XIproto/GetDeviceKeyMapping/GetDeviceKeyMapping
 	"VSW5TESTSUITE CASE GetSelectedExtensionEvents 3"
-	/tset/XIproto/GetSelectedExtensionEvents/GetSelectedExtensionEvents
+	/XIproto/GetSelectedExtensionEvents/GetSelectedExtensionEvents
 	"VSW5TESTSUITE CASE ListInputDevices 3"
-	/tset/XIproto/ListInputDevices/ListInputDevices
+	/XIproto/ListInputDevices/ListInputDevices
 	"VSW5TESTSUITE CASE OpenDevice 3"
-	/tset/XIproto/OpenDevice/OpenDevice
+	/XIproto/OpenDevice/OpenDevice
 	"VSW5TESTSUITE CASE QueryDeviceState 3"
-	/tset/XIproto/QueryDeviceState/QueryDeviceState
+	/XIproto/QueryDeviceState/QueryDeviceState
 	"VSW5TESTSUITE CASE SetDeviceValuators 3"
-	/tset/XIproto/SetDeviceValuators/SetDeviceValuators
+	/XIproto/SetDeviceValuators/SetDeviceValuators
 	"VSW5TESTSUITE CASE SetDeviceButtonMapping 3"
-	/tset/XIproto/SetDeviceButtonMapping/SetDeviceButtonMapping
+	/XIproto/SetDeviceButtonMapping/SetDeviceButtonMapping
 	"VSW5TESTSUITE CASE SetDeviceFocus 3"
-	/tset/XIproto/SetDeviceFocus/SetDeviceFocus
+	/XIproto/SetDeviceFocus/SetDeviceFocus
 	"VSW5TESTSUITE CASE SetDeviceModifierMapping 3"
-	/tset/XIproto/SetDeviceModifierMapping/SetDeviceModifierMapping
+	/XIproto/SetDeviceModifierMapping/SetDeviceModifierMapping
 	"VSW5TESTSUITE CASE SetDeviceMode 3"
-	/tset/XIproto/SetDeviceMode/SetDeviceMode
+	/XIproto/SetDeviceMode/SetDeviceMode
 	"VSW5TESTSUITE CASE SelectExtensionEvent 3"
-	/tset/XIproto/SelectExtensionEvent/SelectExtensionEvent
+	/XIproto/SelectExtensionEvent/SelectExtensionEvent
 	"VSW5TESTSUITE CASE SendExtensionEvent 3"
-	/tset/XIproto/SendExtensionEvent/SendExtensionEvent
+	/XIproto/SendExtensionEvent/SendExtensionEvent
 	"VSW5TESTSUITE CASE UngrabDevice 3"
-	/tset/XIproto/UngrabDevice/UngrabDevice
+	/XIproto/UngrabDevice/UngrabDevice
 	"VSW5TESTSUITE CASE UngrabDeviceButton 3"
-	/tset/XIproto/UngrabDeviceButton/UngrabDeviceButton
+	/XIproto/UngrabDeviceButton/UngrabDeviceButton
 	"VSW5TESTSUITE CASE UngrabDeviceKey 3"
-	/tset/XIproto/UngrabDeviceKey/UngrabDeviceKey
+	/XIproto/UngrabDeviceKey/UngrabDeviceKey
diff --git a/xts5/scenarios/Xlib10_scen b/xts5/scenarios/Xlib10_scen
index b6d9b62a..eb9ba99c 100644
--- a/xts5/scenarios/Xlib10_scen
+++ b/xts5/scenarios/Xlib10_scen
@@ -56,48 +56,48 @@
 #
 
 	"VSW5TESTSUITE CASE XActivateScreenSaver 2"
-	/tset/Xlib10/XActivateScreenSaver/XActivateScreenSaver
+	/Xlib10/XActivateScreenSaver/XActivateScreenSaver
 	"VSW5TESTSUITE CASE XAddHost 3"
-	/tset/Xlib10/XAddHost/XAddHost
+	/Xlib10/XAddHost/XAddHost
 	"VSW5TESTSUITE CASE XAddHosts 3"
-	/tset/Xlib10/XAddHosts/XAddHosts
+	/Xlib10/XAddHosts/XAddHosts
 	"VSW5TESTSUITE CASE XAddToSaveSet 8"
-	/tset/Xlib10/XAddToSaveSet/XAddToSaveSet
+	/Xlib10/XAddToSaveSet/XAddToSaveSet
 	"VSW5TESTSUITE CASE XChangeSaveSet 5"
-	/tset/Xlib10/XChangeSaveSet/XChangeSaveSet
+	/Xlib10/XChangeSaveSet/XChangeSaveSet
 	"VSW5TESTSUITE CASE XDisableAccessControl 2"
-	/tset/Xlib10/XDisableAccessControl/XDisableAccessControl
+	/Xlib10/XDisableAccessControl/XDisableAccessControl
 	"VSW5TESTSUITE CASE XEnableAccessControl 2"
-	/tset/Xlib10/XEnableAccessControl/XEnableAccessControl
+	/Xlib10/XEnableAccessControl/XEnableAccessControl
 	"VSW5TESTSUITE CASE XForceScreenSaver 3"
-	/tset/Xlib10/XForceScreenSaver/XForceScreenSaver
+	/Xlib10/XForceScreenSaver/XForceScreenSaver
 	"VSW5TESTSUITE CASE XGrabServer 1"
-	/tset/Xlib10/XGrabServer/XGrabServer
+	/Xlib10/XGrabServer/XGrabServer
 	"VSW5TESTSUITE CASE XGetScreenSaver 1"
-	/tset/Xlib10/XGetScreenSaver/XGetScreenSaver
+	/Xlib10/XGetScreenSaver/XGetScreenSaver
 	"VSW5TESTSUITE CASE XInstallColormap 6"
-	/tset/Xlib10/XInstallColormap/XInstallColormap
+	/Xlib10/XInstallColormap/XInstallColormap
 	"VSW5TESTSUITE CASE XKillClient 4"
-	/tset/Xlib10/XKillClient/XKillClient
+	/Xlib10/XKillClient/XKillClient
 	"VSW5TESTSUITE CASE XListHosts 2"
-	/tset/Xlib10/XListHosts/XListHosts
+	/Xlib10/XListHosts/XListHosts
 	"VSW5TESTSUITE CASE XListInstalledColormaps 2"
-	/tset/Xlib10/XListInstalledColormaps/XListInstalledColormaps
+	/Xlib10/XListInstalledColormaps/XListInstalledColormaps
 	"VSW5TESTSUITE CASE XRemoveFromSaveSet 3"
-	/tset/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet
+	/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet
 	"VSW5TESTSUITE CASE XRemoveHost 3"
-	/tset/Xlib10/XRemoveHost/XRemoveHost
+	/Xlib10/XRemoveHost/XRemoveHost
 	"VSW5TESTSUITE CASE XRemoveHosts 3"
-	/tset/Xlib10/XRemoveHosts/XRemoveHosts
+	/Xlib10/XRemoveHosts/XRemoveHosts
 	"VSW5TESTSUITE CASE XReparentWindow 13"
-	/tset/Xlib10/XReparentWindow/XReparentWindow
+	/Xlib10/XReparentWindow/XReparentWindow
 	"VSW5TESTSUITE CASE XResetScreenSaver 2"
-	/tset/Xlib10/XResetScreenSaver/XResetScreenSaver
+	/Xlib10/XResetScreenSaver/XResetScreenSaver
 	"VSW5TESTSUITE CASE XSetAccessControl 4"
-	/tset/Xlib10/XSetAccessControl/XSetAccessControl
+	/Xlib10/XSetAccessControl/XSetAccessControl
 	"VSW5TESTSUITE CASE XSetScreenSaver 17"
-	/tset/Xlib10/XSetScreenSaver/XSetScreenSaver
+	/Xlib10/XSetScreenSaver/XSetScreenSaver
 	"VSW5TESTSUITE CASE XUngrabServer 1"
-	/tset/Xlib10/XUngrabServer/XUngrabServer
+	/Xlib10/XUngrabServer/XUngrabServer
 	"VSW5TESTSUITE CASE XUninstallColormap 5"
-	/tset/Xlib10/XUninstallColormap/XUninstallColormap
+	/Xlib10/XUninstallColormap/XUninstallColormap
diff --git a/xts5/scenarios/Xlib11_scen b/xts5/scenarios/Xlib11_scen
index 6a0d2c87..c56ab711 100644
--- a/xts5/scenarios/Xlib11_scen
+++ b/xts5/scenarios/Xlib11_scen
@@ -56,68 +56,68 @@
 #
 
 	"VSW5TESTSUITE CASE ButtonPress 12"
-	/tset/Xlib11/ButtonPress/ButtonPress
+	/Xlib11/ButtonPress/ButtonPress
 	"VSW5TESTSUITE CASE ButtonRelease 9"
-	/tset/Xlib11/ButtonRelease/ButtonRelease
+	/Xlib11/ButtonRelease/ButtonRelease
 	"VSW5TESTSUITE CASE ClientMessage 1"
-	/tset/Xlib11/ClientMessage/ClientMessage
+	/Xlib11/ClientMessage/ClientMessage
 	"VSW5TESTSUITE CASE ColormapNotify 2"
-	/tset/Xlib11/ColormapNotify/ColormapNotify
+	/Xlib11/ColormapNotify/ColormapNotify
 	"VSW5TESTSUITE CASE ConfigureNotify 3"
-	/tset/Xlib11/ConfigureNotify/ConfigureNotify
+	/Xlib11/ConfigureNotify/ConfigureNotify
 	"VSW5TESTSUITE CASE ConfigureRequest 7"
-	/tset/Xlib11/ConfigureRequest/ConfigureRequest
+	/Xlib11/ConfigureRequest/ConfigureRequest
 	"VSW5TESTSUITE CASE CirculateNotify 3"
-	/tset/Xlib11/CirculateNotify/CirculateNotify
+	/Xlib11/CirculateNotify/CirculateNotify
 	"VSW5TESTSUITE CASE CirculateRequest 2"
-	/tset/Xlib11/CirculateRequest/CirculateRequest
+	/Xlib11/CirculateRequest/CirculateRequest
 	"VSW5TESTSUITE CASE CreateNotify 2"
-	/tset/Xlib11/CreateNotify/CreateNotify
+	/Xlib11/CreateNotify/CreateNotify
 	"VSW5TESTSUITE CASE DestroyNotify 3"
-	/tset/Xlib11/DestroyNotify/DestroyNotify
+	/Xlib11/DestroyNotify/DestroyNotify
 	"VSW5TESTSUITE CASE EnterNotify 13"
-	/tset/Xlib11/EnterNotify/EnterNotify
+	/Xlib11/EnterNotify/EnterNotify
 	"VSW5TESTSUITE CASE Expose 7"
-	/tset/Xlib11/Expose/Expose
+	/Xlib11/Expose/Expose
 	"VSW5TESTSUITE CASE FocusIn 21"
-	/tset/Xlib11/FocusIn/FocusIn
+	/Xlib11/FocusIn/FocusIn
 	"VSW5TESTSUITE CASE FocusOut 19"
-	/tset/Xlib11/FocusOut/FocusOut
+	/Xlib11/FocusOut/FocusOut
 	"VSW5TESTSUITE CASE GraphicsExpose 1"
-	/tset/Xlib11/GraphicsExpose/GraphicsExpose
+	/Xlib11/GraphicsExpose/GraphicsExpose
 	"VSW5TESTSUITE CASE GravityNotify 3"
-	/tset/Xlib11/GravityNotify/GravityNotify
+	/Xlib11/GravityNotify/GravityNotify
 	"VSW5TESTSUITE CASE KeymapNotify 4"
-	/tset/Xlib11/KeymapNotify/KeymapNotify
+	/Xlib11/KeymapNotify/KeymapNotify
 	"VSW5TESTSUITE CASE KeyPress 9"
-	/tset/Xlib11/KeyPress/KeyPress
+	/Xlib11/KeyPress/KeyPress
 	"VSW5TESTSUITE CASE KeyRelease 9"
-	/tset/Xlib11/KeyRelease/KeyRelease
+	/Xlib11/KeyRelease/KeyRelease
 	"VSW5TESTSUITE CASE LeaveNotify 15"
-	/tset/Xlib11/LeaveNotify/LeaveNotify
+	/Xlib11/LeaveNotify/LeaveNotify
 	"VSW5TESTSUITE CASE MapNotify 4"
-	/tset/Xlib11/MapNotify/MapNotify
+	/Xlib11/MapNotify/MapNotify
 	"VSW5TESTSUITE CASE MappingNotify 1"
-	/tset/Xlib11/MappingNotify/MappingNotify
+	/Xlib11/MappingNotify/MappingNotify
 	"VSW5TESTSUITE CASE MapRequest 2"
-	/tset/Xlib11/MapRequest/MapRequest
+	/Xlib11/MapRequest/MapRequest
 	"VSW5TESTSUITE CASE MotionNotify 19"
-	/tset/Xlib11/MotionNotify/MotionNotify
+	/Xlib11/MotionNotify/MotionNotify
 	"VSW5TESTSUITE CASE NoExpose 1"
-	/tset/Xlib11/NoExpose/NoExpose
+	/Xlib11/NoExpose/NoExpose
 	"VSW5TESTSUITE CASE PropertyNotify 2"
-	/tset/Xlib11/PropertyNotify/PropertyNotify
+	/Xlib11/PropertyNotify/PropertyNotify
 	"VSW5TESTSUITE CASE ReparentNotify 4"
-	/tset/Xlib11/ReparentNotify/ReparentNotify
+	/Xlib11/ReparentNotify/ReparentNotify
 	"VSW5TESTSUITE CASE ResizeRequest 2"
-	/tset/Xlib11/ResizeRequest/ResizeRequest
+	/Xlib11/ResizeRequest/ResizeRequest
 	"VSW5TESTSUITE CASE SelectionClear 1"
-	/tset/Xlib11/SelectionClear/SelectionClear
+	/Xlib11/SelectionClear/SelectionClear
 	"VSW5TESTSUITE CASE SelectionNotify 1"
-	/tset/Xlib11/SelectionNotify/SelectionNotify
+	/Xlib11/SelectionNotify/SelectionNotify
 	"VSW5TESTSUITE CASE SelectionRequest 1"
-	/tset/Xlib11/SelectionRequest/SelectionRequest
+	/Xlib11/SelectionRequest/SelectionRequest
 	"VSW5TESTSUITE CASE UnmapNotify 3"
-	/tset/Xlib11/UnmapNotify/UnmapNotify
+	/Xlib11/UnmapNotify/UnmapNotify
 	"VSW5TESTSUITE CASE VisibilityNotify 9"
-	/tset/Xlib11/VisibilityNotify/VisibilityNotify
+	/Xlib11/VisibilityNotify/VisibilityNotify
diff --git a/xts5/scenarios/Xlib12_scen b/xts5/scenarios/Xlib12_scen
index 94cd00a1..9a760482 100644
--- a/xts5/scenarios/Xlib12_scen
+++ b/xts5/scenarios/Xlib12_scen
@@ -56,56 +56,56 @@
 #
 
 	"VSW5TESTSUITE CASE XCheckIfEvent 6"
-	/tset/Xlib12/XCheckIfEvent/XCheckIfEvent
+	/Xlib12/XCheckIfEvent/XCheckIfEvent
 	"VSW5TESTSUITE CASE XCheckMaskEvent 6"
-	/tset/Xlib12/XCheckMaskEvent/XCheckMaskEvent
+	/Xlib12/XCheckMaskEvent/XCheckMaskEvent
 	"VSW5TESTSUITE CASE XCheckTypedEvent 6"
-	/tset/Xlib12/XCheckTypedEvent/XCheckTypedEvent
+	/Xlib12/XCheckTypedEvent/XCheckTypedEvent
 	"VSW5TESTSUITE CASE XCheckTypedWindowEvent 6"
-	/tset/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent
+	/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent
 	"VSW5TESTSUITE CASE XCheckWindowEvent 6"
-	/tset/Xlib12/XCheckWindowEvent/XCheckWindowEvent
+	/Xlib12/XCheckWindowEvent/XCheckWindowEvent
 	"VSW5TESTSUITE CASE XDisplayMotionBufferSize 2"
-	/tset/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize
+	/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize
 	"VSW5TESTSUITE CASE XDisplayName 1"
-	/tset/Xlib12/XDisplayName/XDisplayName
+	/Xlib12/XDisplayName/XDisplayName
 	"VSW5TESTSUITE CASE XEventsQueued 6"
-	/tset/Xlib12/XEventsQueued/XEventsQueued
+	/Xlib12/XEventsQueued/XEventsQueued
 	"VSW5TESTSUITE CASE XFlush 1"
-	/tset/Xlib12/XFlush/XFlush
+	/Xlib12/XFlush/XFlush
 	"VSW5TESTSUITE CASE XGetErrorDatabaseText 5"
-	/tset/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText
+	/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText
 	"VSW5TESTSUITE CASE XGetErrorText 2"
-	/tset/Xlib12/XGetErrorText/XGetErrorText
+	/Xlib12/XGetErrorText/XGetErrorText
 	"VSW5TESTSUITE CASE XGetMotionEvents 7"
-	/tset/Xlib12/XGetMotionEvents/XGetMotionEvents
+	/Xlib12/XGetMotionEvents/XGetMotionEvents
 	"VSW5TESTSUITE CASE XIfEvent 4"
-	/tset/Xlib12/XIfEvent/XIfEvent
+	/Xlib12/XIfEvent/XIfEvent
 	"VSW5TESTSUITE CASE XMaskEvent 3"
-	/tset/Xlib12/XMaskEvent/XMaskEvent
+	/Xlib12/XMaskEvent/XMaskEvent
 	"VSW5TESTSUITE CASE XNextEvent 3"
-	/tset/Xlib12/XNextEvent/XNextEvent
+	/Xlib12/XNextEvent/XNextEvent
 	"VSW5TESTSUITE CASE XPeekEvent 3"
-	/tset/Xlib12/XPeekEvent/XPeekEvent
+	/Xlib12/XPeekEvent/XPeekEvent
 	"VSW5TESTSUITE CASE XPeekIfEvent 4"
-	/tset/Xlib12/XPeekIfEvent/XPeekIfEvent
+	/Xlib12/XPeekIfEvent/XPeekIfEvent
 	"VSW5TESTSUITE CASE XPending 3"
-	/tset/Xlib12/XPending/XPending
+	/Xlib12/XPending/XPending
 	"VSW5TESTSUITE CASE XPutBackEvent 2"
-	/tset/Xlib12/XPutBackEvent/XPutBackEvent
+	/Xlib12/XPutBackEvent/XPutBackEvent
 	"VSW5TESTSUITE CASE XSelectInput 8"
-	/tset/Xlib12/XSelectInput/XSelectInput
+	/Xlib12/XSelectInput/XSelectInput
 	"VSW5TESTSUITE CASE XSendEvent 22"
-	/tset/Xlib12/XSendEvent/XSendEvent
+	/Xlib12/XSendEvent/XSendEvent
 	"VSW5TESTSUITE CASE XSetAfterFunction 3"
-	/tset/Xlib12/XSetAfterFunction/XSetAfterFunction
+	/Xlib12/XSetAfterFunction/XSetAfterFunction
 	"VSW5TESTSUITE CASE XSetErrorHandler 9"
-	/tset/Xlib12/XSetErrorHandler/XSetErrorHandler
+	/Xlib12/XSetErrorHandler/XSetErrorHandler
 	"VSW5TESTSUITE CASE XSetIOErrorHandler 7"
-	/tset/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler
+	/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler
 	"VSW5TESTSUITE CASE XSync 5"
-	/tset/Xlib12/XSync/XSync
+	/Xlib12/XSync/XSync
 	"VSW5TESTSUITE CASE XSynchronize 5"
-	/tset/Xlib12/XSynchronize/XSynchronize
+	/Xlib12/XSynchronize/XSynchronize
 	"VSW5TESTSUITE CASE XWindowEvent 3"
-	/tset/Xlib12/XWindowEvent/XWindowEvent
+	/Xlib12/XWindowEvent/XWindowEvent
diff --git a/xts5/scenarios/Xlib13_scen b/xts5/scenarios/Xlib13_scen
index 3032282a..cbf76acd 100644
--- a/xts5/scenarios/Xlib13_scen
+++ b/xts5/scenarios/Xlib13_scen
@@ -56,66 +56,66 @@
 #
 
 	"VSW5TESTSUITE CASE XAllowEvents 29"
-	/tset/Xlib13/XAllowEvents/XAllowEvents
+	/Xlib13/XAllowEvents/XAllowEvents
 	"VSW5TESTSUITE CASE XAutoRepeatOff 1"
-	/tset/Xlib13/XAutoRepeatOff/XAutoRepeatOff
+	/Xlib13/XAutoRepeatOff/XAutoRepeatOff
 	"VSW5TESTSUITE CASE XAutoRepeatOn 1"
-	/tset/Xlib13/XAutoRepeatOn/XAutoRepeatOn
+	/Xlib13/XAutoRepeatOn/XAutoRepeatOn
 	"VSW5TESTSUITE CASE XBell 3"
-	/tset/Xlib13/XBell/XBell
+	/Xlib13/XBell/XBell
 	"VSW5TESTSUITE CASE XChangeActivePointerGrab 5"
-	/tset/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab
+	/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab
 	"VSW5TESTSUITE CASE XChangeKeyboardControl 20"
-	/tset/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl
+	/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl
 	"VSW5TESTSUITE CASE XChangeKeyboardMapping 7"
-	/tset/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping
+	/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping
 	"VSW5TESTSUITE CASE XChangePointerControl 11"
-	/tset/Xlib13/XChangePointerControl/XChangePointerControl
+	/Xlib13/XChangePointerControl/XChangePointerControl
 	"VSW5TESTSUITE CASE XDeleteModifiermapEntry 1"
-	/tset/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry
+	/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry
 	"VSW5TESTSUITE CASE XDisplayKeycodes 3"
-	/tset/Xlib13/XDisplayKeycodes/XDisplayKeycodes
+	/Xlib13/XDisplayKeycodes/XDisplayKeycodes
 	"VSW5TESTSUITE CASE XFreeModifiermap 1"
-	/tset/Xlib13/XFreeModifiermap/XFreeModifiermap
+	/Xlib13/XFreeModifiermap/XFreeModifiermap
 	"VSW5TESTSUITE CASE XGrabButton 39"
-	/tset/Xlib13/XGrabButton/XGrabButton
+	/Xlib13/XGrabButton/XGrabButton
 	"VSW5TESTSUITE CASE XGrabKey 16"
-	/tset/Xlib13/XGrabKey/XGrabKey
+	/Xlib13/XGrabKey/XGrabKey
 	"VSW5TESTSUITE CASE XGrabKeyboard 25"
-	/tset/Xlib13/XGrabKeyboard/XGrabKeyboard
+	/Xlib13/XGrabKeyboard/XGrabKeyboard
 	"VSW5TESTSUITE CASE XGrabPointer 34"
-	/tset/Xlib13/XGrabPointer/XGrabPointer
+	/Xlib13/XGrabPointer/XGrabPointer
 	"VSW5TESTSUITE CASE XGetInputFocus 1"
-	/tset/Xlib13/XGetInputFocus/XGetInputFocus
+	/Xlib13/XGetInputFocus/XGetInputFocus
 	"VSW5TESTSUITE CASE XGetKeyboardControl 1"
-	/tset/Xlib13/XGetKeyboardControl/XGetKeyboardControl
+	/Xlib13/XGetKeyboardControl/XGetKeyboardControl
 	"VSW5TESTSUITE CASE XGetKeyboardMapping 6"
-	/tset/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping
+	/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping
 	"VSW5TESTSUITE CASE XGetModifierMapping 2"
-	/tset/Xlib13/XGetModifierMapping/XGetModifierMapping
+	/Xlib13/XGetModifierMapping/XGetModifierMapping
 	"VSW5TESTSUITE CASE XGetPointerControl 1"
-	/tset/Xlib13/XGetPointerControl/XGetPointerControl
+	/Xlib13/XGetPointerControl/XGetPointerControl
 	"VSW5TESTSUITE CASE XGetPointerMapping 3"
-	/tset/Xlib13/XGetPointerMapping/XGetPointerMapping
+	/Xlib13/XGetPointerMapping/XGetPointerMapping
 	"VSW5TESTSUITE CASE XInsertModifiermapEntry 1"
-	/tset/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry
+	/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry
 	"VSW5TESTSUITE CASE XNewModifiermap 1"
-	/tset/Xlib13/XNewModifiermap/XNewModifiermap
+	/Xlib13/XNewModifiermap/XNewModifiermap
 	"VSW5TESTSUITE CASE XQueryKeymap 1"
-	/tset/Xlib13/XQueryKeymap/XQueryKeymap
+	/Xlib13/XQueryKeymap/XQueryKeymap
 	"VSW5TESTSUITE CASE XSetInputFocus 13"
-	/tset/Xlib13/XSetInputFocus/XSetInputFocus
+	/Xlib13/XSetInputFocus/XSetInputFocus
 	"VSW5TESTSUITE CASE XSetModifierMapping 8"
-	/tset/Xlib13/XSetModifierMapping/XSetModifierMapping
+	/Xlib13/XSetModifierMapping/XSetModifierMapping
 	"VSW5TESTSUITE CASE XSetPointerMapping 7"
-	/tset/Xlib13/XSetPointerMapping/XSetPointerMapping
+	/Xlib13/XSetPointerMapping/XSetPointerMapping
 	"VSW5TESTSUITE CASE XUngrabButton 6"
-	/tset/Xlib13/XUngrabButton/XUngrabButton
+	/Xlib13/XUngrabButton/XUngrabButton
 	"VSW5TESTSUITE CASE XUngrabKey 7"
-	/tset/Xlib13/XUngrabKey/XUngrabKey
+	/Xlib13/XUngrabKey/XUngrabKey
 	"VSW5TESTSUITE CASE XUngrabKeyboard 3"
-	/tset/Xlib13/XUngrabKeyboard/XUngrabKeyboard
+	/Xlib13/XUngrabKeyboard/XUngrabKeyboard
 	"VSW5TESTSUITE CASE XUngrabPointer 3"
-	/tset/Xlib13/XUngrabPointer/XUngrabPointer
+	/Xlib13/XUngrabPointer/XUngrabPointer
 	"VSW5TESTSUITE CASE XWarpPointer 9"
-	/tset/Xlib13/XWarpPointer/XWarpPointer
+	/Xlib13/XWarpPointer/XWarpPointer
diff --git a/xts5/scenarios/Xlib14_scen b/xts5/scenarios/Xlib14_scen
index 8110b240..de0dd958 100644
--- a/xts5/scenarios/Xlib14_scen
+++ b/xts5/scenarios/Xlib14_scen
@@ -56,92 +56,92 @@
 #
 
 	"VSW5TESTSUITE CASE XBaseFontNameListOfFontSet 1"
-	/tset/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet
+	/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet
 	"VSW5TESTSUITE CASE XCloseIM 1"
-	/tset/Xlib14/XCloseIM/XCloseIM
+	/Xlib14/XCloseIM/XCloseIM
 	"VSW5TESTSUITE CASE XContextDependentDrawing 1"
-	/tset/Xlib14/XContextDependentDrawing/XContextDependentDrawing
+	/Xlib14/XContextDependentDrawing/XContextDependentDrawing
 	"VSW5TESTSUITE CASE XCreateFontSet 1"
-	/tset/Xlib14/XCreateFontSet/XCreateFontSet
+	/Xlib14/XCreateFontSet/XCreateFontSet
 	"VSW5TESTSUITE CASE XCreateIC 1"
-	/tset/Xlib14/XCreateIC/XCreateIC
+	/Xlib14/XCreateIC/XCreateIC
 	"VSW5TESTSUITE CASE XDestroyIC 1"
-	/tset/Xlib14/XDestroyIC/XDestroyIC
+	/Xlib14/XDestroyIC/XDestroyIC
 	"VSW5TESTSUITE CASE XDisplayOfIM 1"
-	/tset/Xlib14/XDisplayOfIM/XDisplayOfIM
+	/Xlib14/XDisplayOfIM/XDisplayOfIM
 	"VSW5TESTSUITE CASE XExtentsOfFontSet 1"
-	/tset/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet
+	/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet
 	"VSW5TESTSUITE CASE XFilterEvent 1"
-	/tset/Xlib14/XFilterEvent/XFilterEvent
+	/Xlib14/XFilterEvent/XFilterEvent
 	"VSW5TESTSUITE CASE XFontsOfFontSet 1"
-	/tset/Xlib14/XFontsOfFontSet/XFontsOfFontSet
+	/Xlib14/XFontsOfFontSet/XFontsOfFontSet
 	"VSW5TESTSUITE CASE XFreeFontSet 1"
-	/tset/Xlib14/XFreeFontSet/XFreeFontSet
+	/Xlib14/XFreeFontSet/XFreeFontSet
 	"VSW5TESTSUITE CASE XGetICValues 3"
-	/tset/Xlib14/XGetICValues/XGetICValues
+	/Xlib14/XGetICValues/XGetICValues
 	"VSW5TESTSUITE CASE XGetIMValues 1"
-	/tset/Xlib14/XGetIMValues/XGetIMValues
+	/Xlib14/XGetIMValues/XGetIMValues
 	"VSW5TESTSUITE CASE XIMOfIC 1"
-	/tset/Xlib14/XIMOfIC/XIMOfIC
+	/Xlib14/XIMOfIC/XIMOfIC
 	"VSW5TESTSUITE CASE XLocaleOfFontSet 1"
-	/tset/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet
+	/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet
 	"VSW5TESTSUITE CASE XLocaleOfIM 1"
-	/tset/Xlib14/XLocaleOfIM/XLocaleOfIM
+	/Xlib14/XLocaleOfIM/XLocaleOfIM
 	"VSW5TESTSUITE CASE XmbDrawImageString 1"
-	/tset/Xlib14/XmbDrawImageString/XmbDrawImageString
+	/Xlib14/XmbDrawImageString/XmbDrawImageString
 	"VSW5TESTSUITE CASE XmbDrawString 1"
-	/tset/Xlib14/XmbDrawString/XmbDrawString
+	/Xlib14/XmbDrawString/XmbDrawString
 	"VSW5TESTSUITE CASE XmbDrawText 1"
-	/tset/Xlib14/XmbDrawText/XmbDrawText
+	/Xlib14/XmbDrawText/XmbDrawText
 	"VSW5TESTSUITE CASE XmbLookupString 3"
-	/tset/Xlib14/XmbLookupString/XmbLookupString
+	/Xlib14/XmbLookupString/XmbLookupString
 	"VSW5TESTSUITE CASE XmbResetIC 1"
-	/tset/Xlib14/XmbResetIC/XmbResetIC
+	/Xlib14/XmbResetIC/XmbResetIC
 	"VSW5TESTSUITE CASE XmbSetWMProperties 2"
-	/tset/Xlib14/XmbSetWMProperties/XmbSetWMProperties
+	/Xlib14/XmbSetWMProperties/XmbSetWMProperties
 	"VSW5TESTSUITE CASE XmbTextEscapement 1"
-	/tset/Xlib14/XmbTextEscapement/XmbTextEscapement
+	/Xlib14/XmbTextEscapement/XmbTextEscapement
 	"VSW5TESTSUITE CASE XmbTextExtents 1"
-	/tset/Xlib14/XmbTextExtents/XmbTextExtents
+	/Xlib14/XmbTextExtents/XmbTextExtents
 	"VSW5TESTSUITE CASE XmbTextListToTextProperty 1"
-	/tset/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty
+	/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty
 	"VSW5TESTSUITE CASE XmbTextPerCharExtents 1"
-	/tset/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents
+	/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents
 	"VSW5TESTSUITE CASE XmbTextPropertyToTextList 1"
-	/tset/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList
+	/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList
 	"VSW5TESTSUITE CASE XOpenIM 1"
-	/tset/Xlib14/XOpenIM/XOpenIM
+	/Xlib14/XOpenIM/XOpenIM
 	"VSW5TESTSUITE CASE XSetICFocus 1"
-	/tset/Xlib14/XSetICFocus/XSetICFocus
+	/Xlib14/XSetICFocus/XSetICFocus
 	"VSW5TESTSUITE CASE XSetICValues 4"
-	/tset/Xlib14/XSetICValues/XSetICValues
+	/Xlib14/XSetICValues/XSetICValues
 	"VSW5TESTSUITE CASE XSupportsLocale 1"
-	/tset/Xlib14/XSupportsLocale/XSupportsLocale
+	/Xlib14/XSupportsLocale/XSupportsLocale
 	"VSW5TESTSUITE CASE XSetLocaleModifiers 1"
-	/tset/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers
+	/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers
 	"VSW5TESTSUITE CASE XUnsetICFocus 1"
-	/tset/Xlib14/XUnsetICFocus/XUnsetICFocus
+	/Xlib14/XUnsetICFocus/XUnsetICFocus
 	"VSW5TESTSUITE CASE XVaCreateNestedList 4"
-	/tset/Xlib14/XVaCreateNestedList/XVaCreateNestedList
+	/Xlib14/XVaCreateNestedList/XVaCreateNestedList
 	"VSW5TESTSUITE CASE XwcDrawImageString 1"
-	/tset/Xlib14/XwcDrawImageString/XwcDrawImageString
+	/Xlib14/XwcDrawImageString/XwcDrawImageString
 	"VSW5TESTSUITE CASE XwcDrawString 1"
-	/tset/Xlib14/XwcDrawString/XwcDrawString
+	/Xlib14/XwcDrawString/XwcDrawString
 	"VSW5TESTSUITE CASE XwcDrawText 1"
-	/tset/Xlib14/XwcDrawText/XwcDrawText
+	/Xlib14/XwcDrawText/XwcDrawText
 	"VSW5TESTSUITE CASE XwcFreeStringList 1"
-	/tset/Xlib14/XwcFreeStringList/XwcFreeStringList
+	/Xlib14/XwcFreeStringList/XwcFreeStringList
 	"VSW5TESTSUITE CASE XwcLookupString 3"
-	/tset/Xlib14/XwcLookupString/XwcLookupString
+	/Xlib14/XwcLookupString/XwcLookupString
 	"VSW5TESTSUITE CASE XwcResetIC 1"
-	/tset/Xlib14/XwcResetIC/XwcResetIC
+	/Xlib14/XwcResetIC/XwcResetIC
 	"VSW5TESTSUITE CASE XwcTextEscapement 1"
-	/tset/Xlib14/XwcTextEscapement/XwcTextEscapement
+	/Xlib14/XwcTextEscapement/XwcTextEscapement
 	"VSW5TESTSUITE CASE XwcTextListToTextProperty 1"
-	/tset/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty
+	/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty
 	"VSW5TESTSUITE CASE XwcTextPerCharExtents 1"
-	/tset/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents
+	/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents
 	"VSW5TESTSUITE CASE XwcTextPropertyToTextList 1"
-	/tset/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList
+	/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList
 	"VSW5TESTSUITE CASE XwcTextExtents 1"
-	/tset/Xlib14/XwcTextExtents/XwcTextExtents
+	/Xlib14/XwcTextExtents/XwcTextExtents
diff --git a/xts5/scenarios/Xlib15_scen b/xts5/scenarios/Xlib15_scen
index 7a2a31e0..41715d1b 100644
--- a/xts5/scenarios/Xlib15_scen
+++ b/xts5/scenarios/Xlib15_scen
@@ -56,92 +56,92 @@
 #
 
 	"VSW5TESTSUITE CASE XAllocClassHint 2"
-	/tset/Xlib15/XAllocClassHint/XAllocClassHint
+	/Xlib15/XAllocClassHint/XAllocClassHint
 	"VSW5TESTSUITE CASE XAllocIconSize 2"
-	/tset/Xlib15/XAllocIconSize/XAllocIconSize
+	/Xlib15/XAllocIconSize/XAllocIconSize
 	"VSW5TESTSUITE CASE XAllocStandardColormap 2"
-	/tset/Xlib15/XAllocStandardColormap/XAllocStandardColormap
+	/Xlib15/XAllocStandardColormap/XAllocStandardColormap
 	"VSW5TESTSUITE CASE XAllocSizeHints 2"
-	/tset/Xlib15/XAllocSizeHints/XAllocSizeHints
+	/Xlib15/XAllocSizeHints/XAllocSizeHints
 	"VSW5TESTSUITE CASE XAllocWMHints 2"
-	/tset/Xlib15/XAllocWMHints/XAllocWMHints
+	/Xlib15/XAllocWMHints/XAllocWMHints
 	"VSW5TESTSUITE CASE XFreeStringList 1"
-	/tset/Xlib15/XFreeStringList/XFreeStringList
+	/Xlib15/XFreeStringList/XFreeStringList
 	"VSW5TESTSUITE CASE XFetchName 3"
-	/tset/Xlib15/XFetchName/XFetchName
+	/Xlib15/XFetchName/XFetchName
 	"VSW5TESTSUITE CASE XGetClassHint 3"
-	/tset/Xlib15/XGetClassHint/XGetClassHint
+	/Xlib15/XGetClassHint/XGetClassHint
 	"VSW5TESTSUITE CASE XGetCommand 3"
-	/tset/Xlib15/XGetCommand/XGetCommand
+	/Xlib15/XGetCommand/XGetCommand
 	"VSW5TESTSUITE CASE XGetIconName 3"
-	/tset/Xlib15/XGetIconName/XGetIconName
+	/Xlib15/XGetIconName/XGetIconName
 	"VSW5TESTSUITE CASE XGetIconSizes 3"
-	/tset/Xlib15/XGetIconSizes/XGetIconSizes
+	/Xlib15/XGetIconSizes/XGetIconSizes
 	"VSW5TESTSUITE CASE XGetRGBColormaps 6"
-	/tset/Xlib15/XGetRGBColormaps/XGetRGBColormaps
+	/Xlib15/XGetRGBColormaps/XGetRGBColormaps
 	"VSW5TESTSUITE CASE XGetTransientForHint 3"
-	/tset/Xlib15/XGetTransientForHint/XGetTransientForHint
+	/Xlib15/XGetTransientForHint/XGetTransientForHint
 	"VSW5TESTSUITE CASE XGetTextProperty 4"
-	/tset/Xlib15/XGetTextProperty/XGetTextProperty
+	/Xlib15/XGetTextProperty/XGetTextProperty
 	"VSW5TESTSUITE CASE XGetWMClientMachine 3"
-	/tset/Xlib15/XGetWMClientMachine/XGetWMClientMachine
+	/Xlib15/XGetWMClientMachine/XGetWMClientMachine
 	"VSW5TESTSUITE CASE XGetWMColormapWindows 4"
-	/tset/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows
+	/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows
 	"VSW5TESTSUITE CASE XGetWMHints 3"
-	/tset/Xlib15/XGetWMHints/XGetWMHints
+	/Xlib15/XGetWMHints/XGetWMHints
 	"VSW5TESTSUITE CASE XGetWMIconName 3"
-	/tset/Xlib15/XGetWMIconName/XGetWMIconName
+	/Xlib15/XGetWMIconName/XGetWMIconName
 	"VSW5TESTSUITE CASE XGetWMName 3"
-	/tset/Xlib15/XGetWMName/XGetWMName
+	/Xlib15/XGetWMName/XGetWMName
 	"VSW5TESTSUITE CASE XGetWMNormalHints 5"
-	/tset/Xlib15/XGetWMNormalHints/XGetWMNormalHints
+	/Xlib15/XGetWMNormalHints/XGetWMNormalHints
 	"VSW5TESTSUITE CASE XGetWMProtocols 4"
-	/tset/Xlib15/XGetWMProtocols/XGetWMProtocols
+	/Xlib15/XGetWMProtocols/XGetWMProtocols
 	"VSW5TESTSUITE CASE XGetWMSizeHints 6"
-	/tset/Xlib15/XGetWMSizeHints/XGetWMSizeHints
+	/Xlib15/XGetWMSizeHints/XGetWMSizeHints
 	"VSW5TESTSUITE CASE XIconifyWindow 3"
-	/tset/Xlib15/XIconifyWindow/XIconifyWindow
+	/Xlib15/XIconifyWindow/XIconifyWindow
 	"VSW5TESTSUITE CASE XReconfigureWMWindow 5"
-	/tset/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow
+	/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow
 	"VSW5TESTSUITE CASE XSetClassHint 3"
-	/tset/Xlib15/XSetClassHint/XSetClassHint
+	/Xlib15/XSetClassHint/XSetClassHint
 	"VSW5TESTSUITE CASE XSetCommand 3"
-	/tset/Xlib15/XSetCommand/XSetCommand
+	/Xlib15/XSetCommand/XSetCommand
 	"VSW5TESTSUITE CASE XSetIconName 3"
-	/tset/Xlib15/XSetIconName/XSetIconName
+	/Xlib15/XSetIconName/XSetIconName
 	"VSW5TESTSUITE CASE XSetIconSizes 3"
-	/tset/Xlib15/XSetIconSizes/XSetIconSizes
+	/Xlib15/XSetIconSizes/XSetIconSizes
 	"VSW5TESTSUITE CASE XSetRGBColormaps 4"
-	/tset/Xlib15/XSetRGBColormaps/XSetRGBColormaps
+	/Xlib15/XSetRGBColormaps/XSetRGBColormaps
 	"VSW5TESTSUITE CASE XStringListToTextProperty 3"
-	/tset/Xlib15/XStringListToTextProperty/XStringListToTextProperty
+	/Xlib15/XStringListToTextProperty/XStringListToTextProperty
 	"VSW5TESTSUITE CASE XStoreName 3"
-	/tset/Xlib15/XStoreName/XStoreName
+	/Xlib15/XStoreName/XStoreName
 	"VSW5TESTSUITE CASE XSetTransientForHint 3"
-	/tset/Xlib15/XSetTransientForHint/XSetTransientForHint
+	/Xlib15/XSetTransientForHint/XSetTransientForHint
 	"VSW5TESTSUITE CASE XSetTextProperty 5"
-	/tset/Xlib15/XSetTextProperty/XSetTextProperty
+	/Xlib15/XSetTextProperty/XSetTextProperty
 	"VSW5TESTSUITE CASE XSetWMClientMachine 5"
-	/tset/Xlib15/XSetWMClientMachine/XSetWMClientMachine
+	/Xlib15/XSetWMClientMachine/XSetWMClientMachine
 	"VSW5TESTSUITE CASE XSetWMColormapWindows 4"
-	/tset/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows
+	/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows
 	"VSW5TESTSUITE CASE XSetWMHints 3"
-	/tset/Xlib15/XSetWMHints/XSetWMHints
+	/Xlib15/XSetWMHints/XSetWMHints
 	"VSW5TESTSUITE CASE XSetWMIconName 5"
-	/tset/Xlib15/XSetWMIconName/XSetWMIconName
+	/Xlib15/XSetWMIconName/XSetWMIconName
 	"VSW5TESTSUITE CASE XSetWMName 5"
-	/tset/Xlib15/XSetWMName/XSetWMName
+	/Xlib15/XSetWMName/XSetWMName
 	"VSW5TESTSUITE CASE XSetWMNormalHints 3"
-	/tset/Xlib15/XSetWMNormalHints/XSetWMNormalHints
+	/Xlib15/XSetWMNormalHints/XSetWMNormalHints
 	"VSW5TESTSUITE CASE XSetWMProperties 10"
-	/tset/Xlib15/XSetWMProperties/XSetWMProperties
+	/Xlib15/XSetWMProperties/XSetWMProperties
 	"VSW5TESTSUITE CASE XSetWMProtocols 4"
-	/tset/Xlib15/XSetWMProtocols/XSetWMProtocols
+	/Xlib15/XSetWMProtocols/XSetWMProtocols
 	"VSW5TESTSUITE CASE XSetWMSizeHints 4"
-	/tset/Xlib15/XSetWMSizeHints/XSetWMSizeHints
+	/Xlib15/XSetWMSizeHints/XSetWMSizeHints
 	"VSW5TESTSUITE CASE XTextPropertyToStringList 4"
-	/tset/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList
+	/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList
 	"VSW5TESTSUITE CASE XWithdrawWindow 3"
-	/tset/Xlib15/XWithdrawWindow/XWithdrawWindow
+	/Xlib15/XWithdrawWindow/XWithdrawWindow
 	"VSW5TESTSUITE CASE XDefaultString 1"
-	/tset/Xlib15/XDefaultString/XDefaultString
+	/Xlib15/XDefaultString/XDefaultString
diff --git a/xts5/scenarios/Xlib16_scen b/xts5/scenarios/Xlib16_scen
index 512db9fa..a8c01351 100644
--- a/xts5/scenarios/Xlib16_scen
+++ b/xts5/scenarios/Xlib16_scen
@@ -62,62 +62,62 @@
 #
 
 	"VSW5TESTSUITE CASE XrmDestroyDatabase 3"
-	/tset/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase
+	/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase
 	"VSW5TESTSUITE CASE XrmGetFileDatabase 3"
-	/tset/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase
+	/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase
 	"VSW5TESTSUITE CASE XrmGetResource 2"
-	/tset/Xlib16/XrmGetResource/XrmGetResource
+	/Xlib16/XrmGetResource/XrmGetResource
 	"VSW5TESTSUITE CASE XrmGetStringDatabase 2"
-	/tset/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase
+	/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase
 	"VSW5TESTSUITE CASE XrmInitialize 1"
-	/tset/Xlib16/XrmInitialize/XrmInitialize
+	/Xlib16/XrmInitialize/XrmInitialize
 	"VSW5TESTSUITE CASE XrmMergeDatabases 6"
-	/tset/Xlib16/XrmMergeDatabases/XrmMergeDatabases
+	/Xlib16/XrmMergeDatabases/XrmMergeDatabases
 	"VSW5TESTSUITE CASE XrmParseCommand 12"
-	/tset/Xlib16/XrmParseCommand/XrmParseCommand
+	/Xlib16/XrmParseCommand/XrmParseCommand
 	"VSW5TESTSUITE CASE XrmPutFileDatabase 3"
-	/tset/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase
+	/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase
 	"VSW5TESTSUITE CASE XrmPutLineResource 9"
-	/tset/Xlib16/XrmPutLineResource/XrmPutLineResource
+	/Xlib16/XrmPutLineResource/XrmPutLineResource
 	"VSW5TESTSUITE CASE XrmPutResource 4"
-	/tset/Xlib16/XrmPutResource/XrmPutResource
+	/Xlib16/XrmPutResource/XrmPutResource
 	"VSW5TESTSUITE CASE XrmPutStringResource 4"
-	/tset/Xlib16/XrmPutStringResource/XrmPutStringResource
+	/Xlib16/XrmPutStringResource/XrmPutStringResource
 	"VSW5TESTSUITE CASE XrmQGetResource 2"
-	/tset/Xlib16/XrmQGetResource/XrmQGetResource
+	/Xlib16/XrmQGetResource/XrmQGetResource
 	"VSW5TESTSUITE CASE XrmQGetSearchList 4"
-	/tset/Xlib16/XrmQGetSearchList/XrmQGetSearchList
+	/Xlib16/XrmQGetSearchList/XrmQGetSearchList
 	"VSW5TESTSUITE CASE XrmQGetSearchResource 2"
-	/tset/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource
+	/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource
 	"VSW5TESTSUITE CASE XrmQPutResource 3"
-	/tset/Xlib16/XrmQPutResource/XrmQPutResource
+	/Xlib16/XrmQPutResource/XrmQPutResource
 	"VSW5TESTSUITE CASE XrmQPutStringResource 3"
-	/tset/Xlib16/XrmQPutStringResource/XrmQPutStringResource
+	/Xlib16/XrmQPutStringResource/XrmQPutStringResource
 	"VSW5TESTSUITE CASE XrmQuarkToString 3"
-	/tset/Xlib16/XrmQuarkToString/XrmQuarkToString
+	/Xlib16/XrmQuarkToString/XrmQuarkToString
 	"VSW5TESTSUITE CASE XrmStringToBindingQuarkList 6"
-	/tset/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList
+	/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList
 	"VSW5TESTSUITE CASE XrmStringToQuark 3"
-	/tset/Xlib16/XrmStringToQuark/XrmStringToQuark
+	/Xlib16/XrmStringToQuark/XrmStringToQuark
 	"VSW5TESTSUITE CASE XrmStringToQuarkList 3"
-	/tset/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList
+	/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList
 	"VSW5TESTSUITE CASE XrmUniqueQuark 1"
-	/tset/Xlib16/XrmUniqueQuark/XrmUniqueQuark
+	/Xlib16/XrmUniqueQuark/XrmUniqueQuark
 	"VSW5TESTSUITE CASE XResourceManagerString 2"
-	/tset/Xlib16/XResourceManagerString/XResourceManagerString
+	/Xlib16/XResourceManagerString/XResourceManagerString
 	"VSW5TESTSUITE CASE XrmCombineDatabase 6"
-	/tset/Xlib16/XrmCombineDatabase/XrmCombineDatabase
+	/Xlib16/XrmCombineDatabase/XrmCombineDatabase
 	"VSW5TESTSUITE CASE XrmCombineFileDatabase 6"
-	/tset/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase
+	/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase
 	"VSW5TESTSUITE CASE XrmEnumerateDatabase 3"
-	/tset/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase
+	/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase
 	"VSW5TESTSUITE CASE XrmGetDatabase 2"
-	/tset/Xlib16/XrmGetDatabase/XrmGetDatabase
+	/Xlib16/XrmGetDatabase/XrmGetDatabase
 	"VSW5TESTSUITE CASE XrmLocaleOfDatabase 1"
-	/tset/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase
+	/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase
 	"VSW5TESTSUITE CASE XrmPermStringToQuark 2"
-	/tset/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark
+	/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark
 	"VSW5TESTSUITE CASE XrmSetDatabase 2"
-	/tset/Xlib16/XrmSetDatabase/XrmSetDatabase
+	/Xlib16/XrmSetDatabase/XrmSetDatabase
 	"VSW5TESTSUITE CASE XScreenResourceString 2"
-	/tset/Xlib16/XScreenResourceString/XScreenResourceString
+	/Xlib16/XScreenResourceString/XScreenResourceString
diff --git a/xts5/scenarios/Xlib17_scen b/xts5/scenarios/Xlib17_scen
index ee0ce4cb..25abfd3e 100644
--- a/xts5/scenarios/Xlib17_scen
+++ b/xts5/scenarios/Xlib17_scen
@@ -56,112 +56,112 @@
 #
 
 	"VSW5TESTSUITE CASE XAddPixel 1"
-	/tset/Xlib17/XAddPixel/XAddPixel
+	/Xlib17/XAddPixel/XAddPixel
 	"VSW5TESTSUITE CASE XClipBox 1"
-	/tset/Xlib17/XClipBox/XClipBox
+	/Xlib17/XClipBox/XClipBox
 	"VSW5TESTSUITE CASE XCreateBitmapFromData 4"
-	/tset/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData
+	/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData
 	"VSW5TESTSUITE CASE XCreateImage 3"
-	/tset/Xlib17/XCreateImage/XCreateImage
+	/Xlib17/XCreateImage/XCreateImage
 	"VSW5TESTSUITE CASE XCreatePixmapFromBitmapData 5"
-	/tset/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
+	/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
 	"VSW5TESTSUITE CASE XCreateRegion 2"
-	/tset/Xlib17/XCreateRegion/XCreateRegion
+	/Xlib17/XCreateRegion/XCreateRegion
 	"VSW5TESTSUITE CASE XDeleteContext 2"
-	/tset/Xlib17/XDeleteContext/XDeleteContext
+	/Xlib17/XDeleteContext/XDeleteContext
 	"VSW5TESTSUITE CASE XDestroyImage 1"
-	/tset/Xlib17/XDestroyImage/XDestroyImage
+	/Xlib17/XDestroyImage/XDestroyImage
 	"VSW5TESTSUITE CASE XDestroyRegion 1"
-	/tset/Xlib17/XDestroyRegion/XDestroyRegion
+	/Xlib17/XDestroyRegion/XDestroyRegion
 	"VSW5TESTSUITE CASE XEmptyRegion 2"
-	/tset/Xlib17/XEmptyRegion/XEmptyRegion
+	/Xlib17/XEmptyRegion/XEmptyRegion
 	"VSW5TESTSUITE CASE XEqualRegion 4"
-	/tset/Xlib17/XEqualRegion/XEqualRegion
+	/Xlib17/XEqualRegion/XEqualRegion
 	"VSW5TESTSUITE CASE XFindContext 2"
-	/tset/Xlib17/XFindContext/XFindContext
+	/Xlib17/XFindContext/XFindContext
 	"VSW5TESTSUITE CASE XFetchBuffer 2"
-	/tset/Xlib17/XFetchBuffer/XFetchBuffer
+	/Xlib17/XFetchBuffer/XFetchBuffer
 	"VSW5TESTSUITE CASE XFetchBytes 2"
-	/tset/Xlib17/XFetchBytes/XFetchBytes
+	/Xlib17/XFetchBytes/XFetchBytes
 	"VSW5TESTSUITE CASE XGetDefault 5"
-	/tset/Xlib17/XGetDefault/XGetDefault
+	/Xlib17/XGetDefault/XGetDefault
 	"VSW5TESTSUITE CASE XGetPixel 1"
-	/tset/Xlib17/XGetPixel/XGetPixel
+	/Xlib17/XGetPixel/XGetPixel
 	"VSW5TESTSUITE CASE XGetVisualInfo 3"
-	/tset/Xlib17/XGetVisualInfo/XGetVisualInfo
+	/Xlib17/XGetVisualInfo/XGetVisualInfo
 	"VSW5TESTSUITE CASE XIntersectRegion 1"
-	/tset/Xlib17/XIntersectRegion/XIntersectRegion
+	/Xlib17/XIntersectRegion/XIntersectRegion
 	"VSW5TESTSUITE CASE IsCursorKey 2"
-	/tset/Xlib17/IsCursorKey/IsCursorKey
+	/Xlib17/IsCursorKey/IsCursorKey
 	"VSW5TESTSUITE CASE IsFunctionKey 2"
-	/tset/Xlib17/IsFunctionKey/IsFunctionKey
+	/Xlib17/IsFunctionKey/IsFunctionKey
 	"VSW5TESTSUITE CASE IsKeypadKey 2"
-	/tset/Xlib17/IsKeypadKey/IsKeypadKey
+	/Xlib17/IsKeypadKey/IsKeypadKey
 	"VSW5TESTSUITE CASE IsModifierKey 2"
-	/tset/Xlib17/IsModifierKey/IsModifierKey
+	/Xlib17/IsModifierKey/IsModifierKey
 	"VSW5TESTSUITE CASE IsMiscFunctionKey 2"
-	/tset/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey
+	/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey
 	"VSW5TESTSUITE CASE IsPFKey 2"
-	/tset/Xlib17/IsPFKey/IsPFKey
+	/Xlib17/IsPFKey/IsPFKey
 	"VSW5TESTSUITE CASE XKeycodeToKeysym 2"
-	/tset/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym
+	/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym
 	"VSW5TESTSUITE CASE XKeysymToKeycode 2"
-	/tset/Xlib17/XKeysymToKeycode/XKeysymToKeycode
+	/Xlib17/XKeysymToKeycode/XKeysymToKeycode
 	"VSW5TESTSUITE CASE XKeysymToString 2"
-	/tset/Xlib17/XKeysymToString/XKeysymToString
+	/Xlib17/XKeysymToString/XKeysymToString
 	"VSW5TESTSUITE CASE XLookupKeysym 2"
-	/tset/Xlib17/XLookupKeysym/XLookupKeysym
+	/Xlib17/XLookupKeysym/XLookupKeysym
 	"VSW5TESTSUITE CASE XLookupString 3"
-	/tset/Xlib17/XLookupString/XLookupString
+	/Xlib17/XLookupString/XLookupString
 	"VSW5TESTSUITE CASE XMatchVisualInfo 2"
-	/tset/Xlib17/XMatchVisualInfo/XMatchVisualInfo
+	/Xlib17/XMatchVisualInfo/XMatchVisualInfo
 	"VSW5TESTSUITE CASE XOffsetRegion 1"
-	/tset/Xlib17/XOffsetRegion/XOffsetRegion
+	/Xlib17/XOffsetRegion/XOffsetRegion
 	"VSW5TESTSUITE CASE XPolygonRegion 1"
-	/tset/Xlib17/XPolygonRegion/XPolygonRegion
+	/Xlib17/XPolygonRegion/XPolygonRegion
 	"VSW5TESTSUITE CASE XPointInRegion 2"
-	/tset/Xlib17/XPointInRegion/XPointInRegion
+	/Xlib17/XPointInRegion/XPointInRegion
 	"VSW5TESTSUITE CASE Xpermalloc 2"
-	/tset/Xlib17/Xpermalloc/Xpermalloc
+	/Xlib17/Xpermalloc/Xpermalloc
 	"VSW5TESTSUITE CASE XParseGeometry 3"
-	/tset/Xlib17/XParseGeometry/XParseGeometry
+	/Xlib17/XParseGeometry/XParseGeometry
 	"VSW5TESTSUITE CASE XPutPixel 1"
-	/tset/Xlib17/XPutPixel/XPutPixel
+	/Xlib17/XPutPixel/XPutPixel
 	"VSW5TESTSUITE CASE XRebindKeysym 2"
-	/tset/Xlib17/XRebindKeysym/XRebindKeysym
+	/Xlib17/XRebindKeysym/XRebindKeysym
 	"VSW5TESTSUITE CASE XRectInRegion 3"
-	/tset/Xlib17/XRectInRegion/XRectInRegion
+	/Xlib17/XRectInRegion/XRectInRegion
 	"VSW5TESTSUITE CASE XReadBitmapFile 9"
-	/tset/Xlib17/XReadBitmapFile/XReadBitmapFile
+	/Xlib17/XReadBitmapFile/XReadBitmapFile
 	"VSW5TESTSUITE CASE XRefreshKeyboardMapping 3"
-	/tset/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping
+	/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping
 	"VSW5TESTSUITE CASE XRotateBuffers 2"
-	/tset/Xlib17/XRotateBuffers/XRotateBuffers
+	/Xlib17/XRotateBuffers/XRotateBuffers
 	"VSW5TESTSUITE CASE XSubImage 1"
-	/tset/Xlib17/XSubImage/XSubImage
+	/Xlib17/XSubImage/XSubImage
 	"VSW5TESTSUITE CASE XSubtractRegion 1"
-	/tset/Xlib17/XSubtractRegion/XSubtractRegion
+	/Xlib17/XSubtractRegion/XSubtractRegion
 	"VSW5TESTSUITE CASE XShrinkRegion 3"
-	/tset/Xlib17/XShrinkRegion/XShrinkRegion
+	/Xlib17/XShrinkRegion/XShrinkRegion
 	"VSW5TESTSUITE CASE XStoreBuffer 2"
-	/tset/Xlib17/XStoreBuffer/XStoreBuffer
+	/Xlib17/XStoreBuffer/XStoreBuffer
 	"VSW5TESTSUITE CASE XStoreBytes 2"
-	/tset/Xlib17/XStoreBytes/XStoreBytes
+	/Xlib17/XStoreBytes/XStoreBytes
 	"VSW5TESTSUITE CASE XSetRegion 2"
-	/tset/Xlib17/XSetRegion/XSetRegion
+	/Xlib17/XSetRegion/XSetRegion
 	"VSW5TESTSUITE CASE XStringToKeysym 2"
-	/tset/Xlib17/XStringToKeysym/XStringToKeysym
+	/Xlib17/XStringToKeysym/XStringToKeysym
 	"VSW5TESTSUITE CASE XSaveContext 3"
-	/tset/Xlib17/XSaveContext/XSaveContext
+	/Xlib17/XSaveContext/XSaveContext
 	"VSW5TESTSUITE CASE XUnionRectWithRegion 1"
-	/tset/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion
+	/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion
 	"VSW5TESTSUITE CASE XUnionRegion 1"
-	/tset/Xlib17/XUnionRegion/XUnionRegion
+	/Xlib17/XUnionRegion/XUnionRegion
 	"VSW5TESTSUITE CASE XUniqueContext 1"
-	/tset/Xlib17/XUniqueContext/XUniqueContext
+	/Xlib17/XUniqueContext/XUniqueContext
 	"VSW5TESTSUITE CASE XWMGeometry 9"
-	/tset/Xlib17/XWMGeometry/XWMGeometry
+	/Xlib17/XWMGeometry/XWMGeometry
 	"VSW5TESTSUITE CASE XWriteBitmapFile 6"
-	/tset/Xlib17/XWriteBitmapFile/XWriteBitmapFile
+	/Xlib17/XWriteBitmapFile/XWriteBitmapFile
 	"VSW5TESTSUITE CASE XXorRegion 1"
-	/tset/Xlib17/XXorRegion/XXorRegion
+	/Xlib17/XXorRegion/XXorRegion
diff --git a/xts5/scenarios/Xlib3_scen b/xts5/scenarios/Xlib3_scen
index 607c7d39..2e9a9905 100644
--- a/xts5/scenarios/Xlib3_scen
+++ b/xts5/scenarios/Xlib3_scen
@@ -56,220 +56,220 @@
 #
 
 	"VSW5TESTSUITE CASE XAllPlanes 2"
-	/tset/Xlib3/XAllPlanes/XAllPlanes
+	/Xlib3/XAllPlanes/XAllPlanes
 	"VSW5TESTSUITE CASE XBlackPixel 1"
-	/tset/Xlib3/XBlackPixel/XBlackPixel
+	/Xlib3/XBlackPixel/XBlackPixel
 	"VSW5TESTSUITE CASE XBlackPixelOfScreen 1"
-	/tset/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen
+	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen
 	"VSW5TESTSUITE CASE XBitmapBitOrder 1"
-	/tset/Xlib3/XBitmapBitOrder/XBitmapBitOrder
+	/Xlib3/XBitmapBitOrder/XBitmapBitOrder
 	"VSW5TESTSUITE CASE XBitmapPad 1"
-	/tset/Xlib3/XBitmapPad/XBitmapPad
+	/Xlib3/XBitmapPad/XBitmapPad
 	"VSW5TESTSUITE CASE XBitmapUnit 1"
-	/tset/Xlib3/XBitmapUnit/XBitmapUnit
+	/Xlib3/XBitmapUnit/XBitmapUnit
 	"VSW5TESTSUITE CASE XCellsOfScreen 1"
-	/tset/Xlib3/XCellsOfScreen/XCellsOfScreen
+	/Xlib3/XCellsOfScreen/XCellsOfScreen
 	"VSW5TESTSUITE CASE XCloseDisplay 28"
-	/tset/Xlib3/XCloseDisplay/XCloseDisplay
+	/Xlib3/XCloseDisplay/XCloseDisplay
 	"VSW5TESTSUITE CASE XConnectionNumber 1"
-	/tset/Xlib3/XConnectionNumber/XConnectionNumber
+	/Xlib3/XConnectionNumber/XConnectionNumber
 	"VSW5TESTSUITE CASE XDefaultColormap 1"
-	/tset/Xlib3/XDefaultColormap/XDefaultColormap
+	/Xlib3/XDefaultColormap/XDefaultColormap
 	"VSW5TESTSUITE CASE XDefaultColormapOfScreen 1"
-	/tset/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen
+	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen
 	"VSW5TESTSUITE CASE XDefaultDepth 1"
-	/tset/Xlib3/XDefaultDepth/XDefaultDepth
+	/Xlib3/XDefaultDepth/XDefaultDepth
 	"VSW5TESTSUITE CASE XDefaultDepthOfScreen 1"
-	/tset/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen
+	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen
 	"VSW5TESTSUITE CASE XDefaultGC 1"
-	/tset/Xlib3/XDefaultGC/XDefaultGC
+	/Xlib3/XDefaultGC/XDefaultGC
 	"VSW5TESTSUITE CASE XDefaultGCOfScreen 2"
-	/tset/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen
+	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen
 	"VSW5TESTSUITE CASE XDefaultRootWindow 1"
-	/tset/Xlib3/XDefaultRootWindow/XDefaultRootWindow
+	/Xlib3/XDefaultRootWindow/XDefaultRootWindow
 	"VSW5TESTSUITE CASE XDefaultScreen 1"
-	/tset/Xlib3/XDefaultScreen/XDefaultScreen
+	/Xlib3/XDefaultScreen/XDefaultScreen
 	"VSW5TESTSUITE CASE XDefaultScreenOfDisplay 1"
-	/tset/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
+	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
 	"VSW5TESTSUITE CASE XDefaultVisual 1"
-	/tset/Xlib3/XDefaultVisual/XDefaultVisual
+	/Xlib3/XDefaultVisual/XDefaultVisual
 	"VSW5TESTSUITE CASE XDefaultVisualOfScreen 1"
-	/tset/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen
+	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen
 	"VSW5TESTSUITE CASE XDoesBackingStore 1"
-	/tset/Xlib3/XDoesBackingStore/XDoesBackingStore
+	/Xlib3/XDoesBackingStore/XDoesBackingStore
 	"VSW5TESTSUITE CASE XDisplayCells 1"
-	/tset/Xlib3/XDisplayCells/XDisplayCells
+	/Xlib3/XDisplayCells/XDisplayCells
 	"VSW5TESTSUITE CASE XDisplayHeight 1"
-	/tset/Xlib3/XDisplayHeight/XDisplayHeight
+	/Xlib3/XDisplayHeight/XDisplayHeight
 	"VSW5TESTSUITE CASE XDisplayHeightMM 1"
-	/tset/Xlib3/XDisplayHeightMM/XDisplayHeightMM
+	/Xlib3/XDisplayHeightMM/XDisplayHeightMM
 	"VSW5TESTSUITE CASE XDisplayOfScreen 1"
-	/tset/Xlib3/XDisplayOfScreen/XDisplayOfScreen
+	/Xlib3/XDisplayOfScreen/XDisplayOfScreen
 	"VSW5TESTSUITE CASE XDisplayPlanes 1"
-	/tset/Xlib3/XDisplayPlanes/XDisplayPlanes
+	/Xlib3/XDisplayPlanes/XDisplayPlanes
 	"VSW5TESTSUITE CASE XDisplayString 2"
-	/tset/Xlib3/XDisplayString/XDisplayString
+	/Xlib3/XDisplayString/XDisplayString
 	"VSW5TESTSUITE CASE XDisplayWidth 1"
-	/tset/Xlib3/XDisplayWidth/XDisplayWidth
+	/Xlib3/XDisplayWidth/XDisplayWidth
 	"VSW5TESTSUITE CASE XDisplayWidthMM 1"
-	/tset/Xlib3/XDisplayWidthMM/XDisplayWidthMM
+	/Xlib3/XDisplayWidthMM/XDisplayWidthMM
 	"VSW5TESTSUITE CASE XDoesSaveUnders 1"
-	/tset/Xlib3/XDoesSaveUnders/XDoesSaveUnders
+	/Xlib3/XDoesSaveUnders/XDoesSaveUnders
 	"VSW5TESTSUITE CASE XEventMaskOfScreen 1"
-	/tset/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen
+	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen
 	"VSW5TESTSUITE CASE XFree 1"
-	/tset/Xlib3/XFree/XFree
+	/Xlib3/XFree/XFree
 	"VSW5TESTSUITE CASE XHeightMMOfScreen 1"
-	/tset/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen
+	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen
 	"VSW5TESTSUITE CASE XHeightOfScreen 1"
-	/tset/Xlib3/XHeightOfScreen/XHeightOfScreen
+	/Xlib3/XHeightOfScreen/XHeightOfScreen
 	"VSW5TESTSUITE CASE XImageByteOrder 1"
-	/tset/Xlib3/XImageByteOrder/XImageByteOrder
+	/Xlib3/XImageByteOrder/XImageByteOrder
 	"VSW5TESTSUITE CASE XListDepths 3"
-	/tset/Xlib3/XListDepths/XListDepths
+	/Xlib3/XListDepths/XListDepths
 	"VSW5TESTSUITE CASE XLastKnownRequestProcessed 1"
-	/tset/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed
+	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed
 	"VSW5TESTSUITE CASE XListPixmapFormats 2"
-	/tset/Xlib3/XListPixmapFormats/XListPixmapFormats
+	/Xlib3/XListPixmapFormats/XListPixmapFormats
 	"VSW5TESTSUITE CASE XMinCmapsOfScreen 1"
-	/tset/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen
+	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen
 	"VSW5TESTSUITE CASE XMaxCmapsOfScreen 1"
-	/tset/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen
+	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen
 	"VSW5TESTSUITE CASE XNoOp 1"
-	/tset/Xlib3/XNoOp/XNoOp
+	/Xlib3/XNoOp/XNoOp
 	"VSW5TESTSUITE CASE XNextRequest 2"
-	/tset/Xlib3/XNextRequest/XNextRequest
+	/Xlib3/XNextRequest/XNextRequest
 	"VSW5TESTSUITE CASE XOpenDisplay 10"
-	/tset/Xlib3/XOpenDisplay/XOpenDisplay
+	/Xlib3/XOpenDisplay/XOpenDisplay
 	"VSW5TESTSUITE CASE XPlanesOfScreen 1"
-	/tset/Xlib3/XPlanesOfScreen/XPlanesOfScreen
+	/Xlib3/XPlanesOfScreen/XPlanesOfScreen
 	"VSW5TESTSUITE CASE XProtocolRevision 1"
-	/tset/Xlib3/XProtocolRevision/XProtocolRevision
+	/Xlib3/XProtocolRevision/XProtocolRevision
 	"VSW5TESTSUITE CASE XProtocolVersion 1"
-	/tset/Xlib3/XProtocolVersion/XProtocolVersion
+	/Xlib3/XProtocolVersion/XProtocolVersion
 	"VSW5TESTSUITE CASE XQLength 1"
-	/tset/Xlib3/XQLength/XQLength
+	/Xlib3/XQLength/XQLength
 	"VSW5TESTSUITE CASE XRootWindow 1"
-	/tset/Xlib3/XRootWindow/XRootWindow
+	/Xlib3/XRootWindow/XRootWindow
 	"VSW5TESTSUITE CASE XRootWindowOfScreen 1"
-	/tset/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen
+	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen
 	"VSW5TESTSUITE CASE XScreenCount 1"
-	/tset/Xlib3/XScreenCount/XScreenCount
+	/Xlib3/XScreenCount/XScreenCount
 	"VSW5TESTSUITE CASE XScreenNumberOfScreen 1"
-	/tset/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen
+	/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen
 	"VSW5TESTSUITE CASE XScreenOfDisplay 1"
-	/tset/Xlib3/XScreenOfDisplay/XScreenOfDisplay
+	/Xlib3/XScreenOfDisplay/XScreenOfDisplay
 	"VSW5TESTSUITE CASE XVendorRelease 1"
-	/tset/Xlib3/XVendorRelease/XVendorRelease
+	/Xlib3/XVendorRelease/XVendorRelease
 	"VSW5TESTSUITE CASE XServerVendor 1"
-	/tset/Xlib3/XServerVendor/XServerVendor
+	/Xlib3/XServerVendor/XServerVendor
 	"VSW5TESTSUITE CASE XSetCloseDownMode 7"
-	/tset/Xlib3/XSetCloseDownMode/XSetCloseDownMode
+	/Xlib3/XSetCloseDownMode/XSetCloseDownMode
 	"VSW5TESTSUITE CASE XWidthMMOfScreen 1"
-	/tset/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen
+	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen
 	"VSW5TESTSUITE CASE XWidthOfScreen 1"
-	/tset/Xlib3/XWidthOfScreen/XWidthOfScreen
+	/Xlib3/XWidthOfScreen/XWidthOfScreen
 	"VSW5TESTSUITE CASE XWhitePixel 1"
-	/tset/Xlib3/XWhitePixel/XWhitePixel
+	/Xlib3/XWhitePixel/XWhitePixel
 	"VSW5TESTSUITE CASE XWhitePixelOfScreen 1"
-	/tset/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen
+	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen
 	"VSW5TESTSUITE CASE BlackPixel 1"
-	/tset/Xlib3/XBlackPixel/XBlackPixel_m
+	/Xlib3/XBlackPixel/XBlackPixel_m
 	"VSW5TESTSUITE CASE BlackPixelOfScreen 1"
-	/tset/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen_m
+	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen_m
 	"VSW5TESTSUITE CASE BitmapBitOrder 1"
-	/tset/Xlib3/XBitmapBitOrder/XBitmapBitOrder_m
+	/Xlib3/XBitmapBitOrder/XBitmapBitOrder_m
 	"VSW5TESTSUITE CASE BitmapPad 1"
-	/tset/Xlib3/XBitmapPad/XBitmapPad_m
+	/Xlib3/XBitmapPad/XBitmapPad_m
 	"VSW5TESTSUITE CASE BitmapUnit 1"
-	/tset/Xlib3/XBitmapUnit/XBitmapUnit_m
+	/Xlib3/XBitmapUnit/XBitmapUnit_m
 	"VSW5TESTSUITE CASE CellsOfScreen 1"
-	/tset/Xlib3/XCellsOfScreen/XCellsOfScreen_m
+	/Xlib3/XCellsOfScreen/XCellsOfScreen_m
 	"VSW5TESTSUITE CASE ConnectionNumber 1"
-	/tset/Xlib3/XConnectionNumber/XConnectionNumber_m
+	/Xlib3/XConnectionNumber/XConnectionNumber_m
 	"VSW5TESTSUITE CASE DefaultColormap 1"
-	/tset/Xlib3/XDefaultColormap/XDefaultColormap_m
+	/Xlib3/XDefaultColormap/XDefaultColormap_m
 	"VSW5TESTSUITE CASE DefaultColormapOfScreen 1"
-	/tset/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
+	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
 	"VSW5TESTSUITE CASE DefaultDepth 1"
-	/tset/Xlib3/XDefaultDepth/XDefaultDepth_m
+	/Xlib3/XDefaultDepth/XDefaultDepth_m
 	"VSW5TESTSUITE CASE DefaultDepthOfScreen 1"
-	/tset/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
+	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
 	"VSW5TESTSUITE CASE DefaultGC 1"
-	/tset/Xlib3/XDefaultGC/XDefaultGC_m
+	/Xlib3/XDefaultGC/XDefaultGC_m
 	"VSW5TESTSUITE CASE DefaultGCOfScreen 2"
-	/tset/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen_m
+	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen_m
 	"VSW5TESTSUITE CASE DefaultRootWindow 1"
-	/tset/Xlib3/XDefaultRootWindow/XDefaultRootWindow_m
+	/Xlib3/XDefaultRootWindow/XDefaultRootWindow_m
 	"VSW5TESTSUITE CASE DefaultScreen 1"
-	/tset/Xlib3/XDefaultScreen/XDefaultScreen_m
+	/Xlib3/XDefaultScreen/XDefaultScreen_m
 	"VSW5TESTSUITE CASE DefaultScreenOfDisplay 1"
-	/tset/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
+	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
 	"VSW5TESTSUITE CASE DefaultVisual 1"
-	/tset/Xlib3/XDefaultVisual/XDefaultVisual_m
+	/Xlib3/XDefaultVisual/XDefaultVisual_m
 	"VSW5TESTSUITE CASE DefaultVisualOfScreen 1"
-	/tset/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
+	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
 	"VSW5TESTSUITE CASE DoesBackingStore 1"
-	/tset/Xlib3/XDoesBackingStore/XDoesBackingStore_m
+	/Xlib3/XDoesBackingStore/XDoesBackingStore_m
 	"VSW5TESTSUITE CASE DisplayCells 1"
-	/tset/Xlib3/XDisplayCells/XDisplayCells_m
+	/Xlib3/XDisplayCells/XDisplayCells_m
 	"VSW5TESTSUITE CASE DisplayHeight 1"
-	/tset/Xlib3/XDisplayHeight/XDisplayHeight_m
+	/Xlib3/XDisplayHeight/XDisplayHeight_m
 	"VSW5TESTSUITE CASE DisplayHeightMM 1"
-	/tset/Xlib3/XDisplayHeightMM/XDisplayHeightMM_m
+	/Xlib3/XDisplayHeightMM/XDisplayHeightMM_m
 	"VSW5TESTSUITE CASE DisplayOfScreen 1"
-	/tset/Xlib3/XDisplayOfScreen/XDisplayOfScreen_m
+	/Xlib3/XDisplayOfScreen/XDisplayOfScreen_m
 	"VSW5TESTSUITE CASE DisplayPlanes 1"
-	/tset/Xlib3/XDisplayPlanes/XDisplayPlanes_m
+	/Xlib3/XDisplayPlanes/XDisplayPlanes_m
 	"VSW5TESTSUITE CASE DisplayString 2"
-	/tset/Xlib3/XDisplayString/XDisplayString_m
+	/Xlib3/XDisplayString/XDisplayString_m
 	"VSW5TESTSUITE CASE DisplayWidth 1"
-	/tset/Xlib3/XDisplayWidth/XDisplayWidth_m
+	/Xlib3/XDisplayWidth/XDisplayWidth_m
 	"VSW5TESTSUITE CASE DisplayWidthMM 1"
-	/tset/Xlib3/XDisplayWidthMM/XDisplayWidthMM_m
+	/Xlib3/XDisplayWidthMM/XDisplayWidthMM_m
 	"VSW5TESTSUITE CASE DoesSaveUnders 1"
-	/tset/Xlib3/XDoesSaveUnders/XDoesSaveUnders_m
+	/Xlib3/XDoesSaveUnders/XDoesSaveUnders_m
 	"VSW5TESTSUITE CASE EventMaskOfScreen 1"
-	/tset/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen_m
+	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen_m
 	"VSW5TESTSUITE CASE HeightMMOfScreen 1"
-	/tset/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen_m
+	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen_m
 	"VSW5TESTSUITE CASE HeightOfScreen 1"
-	/tset/Xlib3/XHeightOfScreen/XHeightOfScreen_m
+	/Xlib3/XHeightOfScreen/XHeightOfScreen_m
 	"VSW5TESTSUITE CASE ImageByteOrder 1"
-	/tset/Xlib3/XImageByteOrder/XImageByteOrder_m
+	/Xlib3/XImageByteOrder/XImageByteOrder_m
 	"VSW5TESTSUITE CASE LastKnownRequestProcessed 1"
-	/tset/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
+	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
 	"VSW5TESTSUITE CASE MinCmapsOfScreen 1"
-	/tset/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen_m
+	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen_m
 	"VSW5TESTSUITE CASE MaxCmapsOfScreen 1"
-	/tset/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
+	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
 	"VSW5TESTSUITE CASE NextRequest 2"
-	/tset/Xlib3/XNextRequest/XNextRequest_m
+	/Xlib3/XNextRequest/XNextRequest_m
 	"VSW5TESTSUITE CASE PlanesOfScreen 1"
-	/tset/Xlib3/XPlanesOfScreen/XPlanesOfScreen_m
+	/Xlib3/XPlanesOfScreen/XPlanesOfScreen_m
 	"VSW5TESTSUITE CASE ProtocolRevision 1"
-	/tset/Xlib3/XProtocolRevision/XProtocolRevision_m
+	/Xlib3/XProtocolRevision/XProtocolRevision_m
 	"VSW5TESTSUITE CASE ProtocolVersion 1"
-	/tset/Xlib3/XProtocolVersion/XProtocolVersion_m
+	/Xlib3/XProtocolVersion/XProtocolVersion_m
 	"VSW5TESTSUITE CASE QLength 1"
-	/tset/Xlib3/XQLength/XQLength_m
+	/Xlib3/XQLength/XQLength_m
 	"VSW5TESTSUITE CASE RootWindow 1"
-	/tset/Xlib3/XRootWindow/XRootWindow_m
+	/Xlib3/XRootWindow/XRootWindow_m
 	"VSW5TESTSUITE CASE RootWindowOfScreen 1"
-	/tset/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen_m
+	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen_m
 	"VSW5TESTSUITE CASE ScreenCount 1"
-	/tset/Xlib3/XScreenCount/XScreenCount_m
+	/Xlib3/XScreenCount/XScreenCount_m
 	"VSW5TESTSUITE CASE ScreenOfDisplay 1"
-	/tset/Xlib3/XScreenOfDisplay/XScreenOfDisplay_m
+	/Xlib3/XScreenOfDisplay/XScreenOfDisplay_m
 	"VSW5TESTSUITE CASE VendorRelease 1"
-	/tset/Xlib3/XVendorRelease/XVendorRelease_m
+	/Xlib3/XVendorRelease/XVendorRelease_m
 	"VSW5TESTSUITE CASE ServerVendor 1"
-	/tset/Xlib3/XServerVendor/XServerVendor_m
+	/Xlib3/XServerVendor/XServerVendor_m
 	"VSW5TESTSUITE CASE WidthMMOfScreen 1"
-	/tset/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen_m
+	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen_m
 	"VSW5TESTSUITE CASE WidthOfScreen 1"
-	/tset/Xlib3/XWidthOfScreen/XWidthOfScreen_m
+	/Xlib3/XWidthOfScreen/XWidthOfScreen_m
 	"VSW5TESTSUITE CASE WhitePixel 1"
-	/tset/Xlib3/XWhitePixel/XWhitePixel_m
+	/Xlib3/XWhitePixel/XWhitePixel_m
 	"VSW5TESTSUITE CASE WhitePixelOfScreen 1"
-	/tset/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen_m
+	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen_m
diff --git a/xts5/scenarios/Xlib4_scen b/xts5/scenarios/Xlib4_scen
index 2c58dba8..d228eb3d 100644
--- a/xts5/scenarios/Xlib4_scen
+++ b/xts5/scenarios/Xlib4_scen
@@ -56,60 +56,60 @@
 #
 
 	"VSW5TESTSUITE CASE XChangeWindowAttributes 46"
-	/tset/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes
+	/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes
 	"VSW5TESTSUITE CASE XConfigureWindow 34"
-	/tset/Xlib4/XConfigureWindow/XConfigureWindow
+	/Xlib4/XConfigureWindow/XConfigureWindow
 	"VSW5TESTSUITE CASE XCirculateSubwindows 7"
-	/tset/Xlib4/XCirculateSubwindows/XCirculateSubwindows
+	/Xlib4/XCirculateSubwindows/XCirculateSubwindows
 	"VSW5TESTSUITE CASE XCirculateSubwindowsDown 5"
-	/tset/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown
+	/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown
 	"VSW5TESTSUITE CASE XCirculateSubwindowsUp 5"
-	/tset/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp
+	/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp
 	"VSW5TESTSUITE CASE XCreateSimpleWindow 12"
-	/tset/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow
+	/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow
 	"VSW5TESTSUITE CASE XCreateWindow 49"
-	/tset/Xlib4/XCreateWindow/XCreateWindow
+	/Xlib4/XCreateWindow/XCreateWindow
 	"VSW5TESTSUITE CASE XDefineCursor 6"
-	/tset/Xlib4/XDefineCursor/XDefineCursor
+	/Xlib4/XDefineCursor/XDefineCursor
 	"VSW5TESTSUITE CASE XDestroySubwindows 5"
-	/tset/Xlib4/XDestroySubwindows/XDestroySubwindows
+	/Xlib4/XDestroySubwindows/XDestroySubwindows
 	"VSW5TESTSUITE CASE XDestroyWindow 6"
-	/tset/Xlib4/XDestroyWindow/XDestroyWindow
+	/Xlib4/XDestroyWindow/XDestroyWindow
 	"VSW5TESTSUITE CASE XLowerWindow 4"
-	/tset/Xlib4/XLowerWindow/XLowerWindow
+	/Xlib4/XLowerWindow/XLowerWindow
 	"VSW5TESTSUITE CASE XMapRaised 15"
-	/tset/Xlib4/XMapRaised/XMapRaised
+	/Xlib4/XMapRaised/XMapRaised
 	"VSW5TESTSUITE CASE XMapSubwindows 14"
-	/tset/Xlib4/XMapSubwindows/XMapSubwindows
+	/Xlib4/XMapSubwindows/XMapSubwindows
 	"VSW5TESTSUITE CASE XMapWindow 15"
-	/tset/Xlib4/XMapWindow/XMapWindow
+	/Xlib4/XMapWindow/XMapWindow
 	"VSW5TESTSUITE CASE XMoveResizeWindow 15"
-	/tset/Xlib4/XMoveResizeWindow/XMoveResizeWindow
+	/Xlib4/XMoveResizeWindow/XMoveResizeWindow
 	"VSW5TESTSUITE CASE XMoveWindow 8"
-	/tset/Xlib4/XMoveWindow/XMoveWindow
+	/Xlib4/XMoveWindow/XMoveWindow
 	"VSW5TESTSUITE CASE XRestackWindows 6"
-	/tset/Xlib4/XRestackWindows/XRestackWindows
+	/Xlib4/XRestackWindows/XRestackWindows
 	"VSW5TESTSUITE CASE XRaiseWindow 4"
-	/tset/Xlib4/XRaiseWindow/XRaiseWindow
+	/Xlib4/XRaiseWindow/XRaiseWindow
 	"VSW5TESTSUITE CASE XResizeWindow 13"
-	/tset/Xlib4/XResizeWindow/XResizeWindow
+	/Xlib4/XResizeWindow/XResizeWindow
 	"VSW5TESTSUITE CASE XSetWindowBackground 4"
-	/tset/Xlib4/XSetWindowBackground/XSetWindowBackground
+	/Xlib4/XSetWindowBackground/XSetWindowBackground
 	"VSW5TESTSUITE CASE XSetWindowBackgroundPixmap 11"
-	/tset/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap
+	/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap
 	"VSW5TESTSUITE CASE XSetWindowBorder 5"
-	/tset/Xlib4/XSetWindowBorder/XSetWindowBorder
+	/Xlib4/XSetWindowBorder/XSetWindowBorder
 	"VSW5TESTSUITE CASE XSetWindowBorderPixmap 9"
-	/tset/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap
+	/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap
 	"VSW5TESTSUITE CASE XSetWindowBorderWidth 7"
-	/tset/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth
+	/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth
 	"VSW5TESTSUITE CASE XSetWindowColormap 4"
-	/tset/Xlib4/XSetWindowColormap/XSetWindowColormap
+	/Xlib4/XSetWindowColormap/XSetWindowColormap
 	"VSW5TESTSUITE CASE XUndefineCursor 3"
-	/tset/Xlib4/XUndefineCursor/XUndefineCursor
+	/Xlib4/XUndefineCursor/XUndefineCursor
 	"VSW5TESTSUITE CASE XUnmapSubwindows 5"
-	/tset/Xlib4/XUnmapSubwindows/XUnmapSubwindows
+	/Xlib4/XUnmapSubwindows/XUnmapSubwindows
 	"VSW5TESTSUITE CASE XUnmapWindow 6"
-	/tset/Xlib4/XUnmapWindow/XUnmapWindow
+	/Xlib4/XUnmapWindow/XUnmapWindow
 	"VSW5TESTSUITE CASE XVisualIDFromVisual 1"
-	/tset/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual
+	/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual
diff --git a/xts5/scenarios/Xlib5_scen b/xts5/scenarios/Xlib5_scen
index 4b153969..8dd961b2 100644
--- a/xts5/scenarios/Xlib5_scen
+++ b/xts5/scenarios/Xlib5_scen
@@ -56,32 +56,32 @@
 #
 
 	"VSW5TESTSUITE CASE XChangeProperty 13"
-	/tset/Xlib5/XChangeProperty/XChangeProperty
+	/Xlib5/XChangeProperty/XChangeProperty
 	"VSW5TESTSUITE CASE XConvertSelection 5"
-	/tset/Xlib5/XConvertSelection/XConvertSelection
+	/Xlib5/XConvertSelection/XConvertSelection
 	"VSW5TESTSUITE CASE XDeleteProperty 4"
-	/tset/Xlib5/XDeleteProperty/XDeleteProperty
+	/Xlib5/XDeleteProperty/XDeleteProperty
 	"VSW5TESTSUITE CASE XGetAtomName 2"
-	/tset/Xlib5/XGetAtomName/XGetAtomName
+	/Xlib5/XGetAtomName/XGetAtomName
 	"VSW5TESTSUITE CASE XGetGeometry 4"
-	/tset/Xlib5/XGetGeometry/XGetGeometry
+	/Xlib5/XGetGeometry/XGetGeometry
 	"VSW5TESTSUITE CASE XGetSelectionOwner 3"
-	/tset/Xlib5/XGetSelectionOwner/XGetSelectionOwner
+	/Xlib5/XGetSelectionOwner/XGetSelectionOwner
 	"VSW5TESTSUITE CASE XGetWindowAttributes 3"
-	/tset/Xlib5/XGetWindowAttributes/XGetWindowAttributes
+	/Xlib5/XGetWindowAttributes/XGetWindowAttributes
 	"VSW5TESTSUITE CASE XGetWindowProperty 10"
-	/tset/Xlib5/XGetWindowProperty/XGetWindowProperty
+	/Xlib5/XGetWindowProperty/XGetWindowProperty
 	"VSW5TESTSUITE CASE XInternAtom 8"
-	/tset/Xlib5/XInternAtom/XInternAtom
+	/Xlib5/XInternAtom/XInternAtom
 	"VSW5TESTSUITE CASE XListProperties 3"
-	/tset/Xlib5/XListProperties/XListProperties
+	/Xlib5/XListProperties/XListProperties
 	"VSW5TESTSUITE CASE XQueryPointer 6"
-	/tset/Xlib5/XQueryPointer/XQueryPointer
+	/Xlib5/XQueryPointer/XQueryPointer
 	"VSW5TESTSUITE CASE XQueryTree 3"
-	/tset/Xlib5/XQueryTree/XQueryTree
+	/Xlib5/XQueryTree/XQueryTree
 	"VSW5TESTSUITE CASE XRotateWindowProperties 6"
-	/tset/Xlib5/XRotateWindowProperties/XRotateWindowProperties
+	/Xlib5/XRotateWindowProperties/XRotateWindowProperties
 	"VSW5TESTSUITE CASE XSetSelectionOwner 9"
-	/tset/Xlib5/XSetSelectionOwner/XSetSelectionOwner
+	/Xlib5/XSetSelectionOwner/XSetSelectionOwner
 	"VSW5TESTSUITE CASE XTranslateCoordinates 5"
-	/tset/Xlib5/XTranslateCoordinates/XTranslateCoordinates
+	/Xlib5/XTranslateCoordinates/XTranslateCoordinates
diff --git a/xts5/scenarios/Xlib6_scen b/xts5/scenarios/Xlib6_scen
index 5ef5c9e2..779edec3 100644
--- a/xts5/scenarios/Xlib6_scen
+++ b/xts5/scenarios/Xlib6_scen
@@ -56,18 +56,18 @@
 #
 
 	"VSW5TESTSUITE CASE XCreatePixmap 6"
-	/tset/Xlib6/XCreatePixmap/XCreatePixmap
+	/Xlib6/XCreatePixmap/XCreatePixmap
 	"VSW5TESTSUITE CASE XCreateFontCursor 3"
-	/tset/Xlib6/XCreateFontCursor/XCreateFontCursor
+	/Xlib6/XCreateFontCursor/XCreateFontCursor
 	"VSW5TESTSUITE CASE XCreateGlyphCursor 17"
-	/tset/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor
+	/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor
 	"VSW5TESTSUITE CASE XCreatePixmapCursor 13"
-	/tset/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor
+	/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor
 	"VSW5TESTSUITE CASE XFreeCursor 3"
-	/tset/Xlib6/XFreeCursor/XFreeCursor
+	/Xlib6/XFreeCursor/XFreeCursor
 	"VSW5TESTSUITE CASE XFreePixmap 3"
-	/tset/Xlib6/XFreePixmap/XFreePixmap
+	/Xlib6/XFreePixmap/XFreePixmap
 	"VSW5TESTSUITE CASE XQueryBestCursor 2"
-	/tset/Xlib6/XQueryBestCursor/XQueryBestCursor
+	/Xlib6/XQueryBestCursor/XQueryBestCursor
 	"VSW5TESTSUITE CASE XRecolorCursor 3"
-	/tset/Xlib6/XRecolorCursor/XRecolorCursor
+	/Xlib6/XRecolorCursor/XRecolorCursor
diff --git a/xts5/scenarios/Xlib7_scen b/xts5/scenarios/Xlib7_scen
index 72db5871..343be17f 100644
--- a/xts5/scenarios/Xlib7_scen
+++ b/xts5/scenarios/Xlib7_scen
@@ -56,118 +56,118 @@
 #
 
 	"VSW5TESTSUITE CASE XAllocColor 5"
-	/tset/Xlib7/XAllocColor/XAllocColor
+	/Xlib7/XAllocColor/XAllocColor
 	"VSW5TESTSUITE CASE XAllocColorCells 9"
-	/tset/Xlib7/XAllocColorCells/XAllocColorCells
+	/Xlib7/XAllocColorCells/XAllocColorCells
 	"VSW5TESTSUITE CASE XAllocColorPlanes 7"
-	/tset/Xlib7/XAllocColorPlanes/XAllocColorPlanes
+	/Xlib7/XAllocColorPlanes/XAllocColorPlanes
 	"VSW5TESTSUITE CASE XAllocNamedColor 6"
-	/tset/Xlib7/XAllocNamedColor/XAllocNamedColor
+	/Xlib7/XAllocNamedColor/XAllocNamedColor
 	"VSW5TESTSUITE CASE XCopyColormapAndFree 5"
-	/tset/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree
+	/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree
 	"VSW5TESTSUITE CASE XCreateColormap 13"
-	/tset/Xlib7/XCreateColormap/XCreateColormap
+	/Xlib7/XCreateColormap/XCreateColormap
 	"VSW5TESTSUITE CASE XFreeColormap 5"
-	/tset/Xlib7/XFreeColormap/XFreeColormap
+	/Xlib7/XFreeColormap/XFreeColormap
 	"VSW5TESTSUITE CASE XFreeColors 9"
-	/tset/Xlib7/XFreeColors/XFreeColors
+	/Xlib7/XFreeColors/XFreeColors
 	"VSW5TESTSUITE CASE XLookupColor 4"
-	/tset/Xlib7/XLookupColor/XLookupColor
+	/Xlib7/XLookupColor/XLookupColor
 	"VSW5TESTSUITE CASE XParseColor 10"
-	/tset/Xlib7/XParseColor/XParseColor
+	/Xlib7/XParseColor/XParseColor
 	"VSW5TESTSUITE CASE XQueryColor 3"
-	/tset/Xlib7/XQueryColor/XQueryColor
+	/Xlib7/XQueryColor/XQueryColor
 	"VSW5TESTSUITE CASE XQueryColors 3"
-	/tset/Xlib7/XQueryColors/XQueryColors
+	/Xlib7/XQueryColors/XQueryColors
 	"VSW5TESTSUITE CASE XStoreColor 8"
-	/tset/Xlib7/XStoreColor/XStoreColor
+	/Xlib7/XStoreColor/XStoreColor
 	"VSW5TESTSUITE CASE XStoreColors 9"
-	/tset/Xlib7/XStoreColors/XStoreColors
+	/Xlib7/XStoreColors/XStoreColors
 	"VSW5TESTSUITE CASE XStoreNamedColor 9"
-	/tset/Xlib7/XStoreNamedColor/XStoreNamedColor
+	/Xlib7/XStoreNamedColor/XStoreNamedColor
 	"VSW5TESTSUITE CASE XcmsAllocColor 2"
-	/tset/Xlib7/XcmsAllocColor/XcmsAllocColor
+	/Xlib7/XcmsAllocColor/XcmsAllocColor
 	"VSW5TESTSUITE CASE XcmsAddColorSpace 1"
-	/tset/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace
+	/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace
 	"VSW5TESTSUITE CASE XcmsAddFunctionSet 1"
-	/tset/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet
+	/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet
 	"VSW5TESTSUITE CASE XcmsAllocNamedColor 2"
-	/tset/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor
+	/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor
 	"VSW5TESTSUITE CASE XcmsCCCOfColormap 1"
-	/tset/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap
+	/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap
 	"VSW5TESTSUITE CASE XcmsConvertColors 1"
-	/tset/Xlib7/XcmsConvertColors/XcmsConvertColors
+	/Xlib7/XcmsConvertColors/XcmsConvertColors
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMaxLC 1"
-	/tset/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC
+	/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMaxC 1"
-	/tset/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC
+	/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMaxL 1"
-	/tset/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL
+	/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL
 	"VSW5TESTSUITE CASE XcmsConversionProc 9"
-	/tset/Xlib7/XcmsConversionProc/XcmsConversionProc
+	/Xlib7/XcmsConversionProc/XcmsConversionProc
 	"VSW5TESTSUITE CASE XcmsConversionProc 4"
-	/tset/Xlib7/XcmsConversionProc/XcmsConversionProc
+	/Xlib7/XcmsConversionProc/XcmsConversionProc
 	"VSW5TESTSUITE CASE XcmsCreateCCC 1"
-	/tset/Xlib7/XcmsCreateCCC/XcmsCreateCCC
+	/Xlib7/XcmsCreateCCC/XcmsCreateCCC
 	"VSW5TESTSUITE CASE XcmsDefaultCCC 1"
-	/tset/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC
+	/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC
 	"VSW5TESTSUITE CASE XcmsDisplayOfCCC 1"
-	/tset/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC
+	/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC
 	"VSW5TESTSUITE CASE XcmsFreeCCC 1"
-	/tset/Xlib7/XcmsFreeCCC/XcmsFreeCCC
+	/Xlib7/XcmsFreeCCC/XcmsFreeCCC
 	"VSW5TESTSUITE CASE XcmsFormatOfPrefix 2"
-	/tset/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix
+	/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix
 	"VSW5TESTSUITE CASE XcmsLookupColor 1"
-	/tset/Xlib7/XcmsLookupColor/XcmsLookupColor
+	/Xlib7/XcmsLookupColor/XcmsLookupColor
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMinL 1"
-	/tset/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL
+	/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL
 	"VSW5TESTSUITE CASE XcmsPrefixOfFormat 1"
-	/tset/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat
+	/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat
 	"VSW5TESTSUITE CASE XcmsQueryBlack 1"
-	/tset/Xlib7/XcmsQueryBlack/XcmsQueryBlack
+	/Xlib7/XcmsQueryBlack/XcmsQueryBlack
 	"VSW5TESTSUITE CASE XcmsQueryBlue 1"
-	/tset/Xlib7/XcmsQueryBlue/XcmsQueryBlue
+	/Xlib7/XcmsQueryBlue/XcmsQueryBlue
 	"VSW5TESTSUITE CASE XcmsQueryColor 1"
-	/tset/Xlib7/XcmsQueryColor/XcmsQueryColor
+	/Xlib7/XcmsQueryColor/XcmsQueryColor
 	"VSW5TESTSUITE CASE XcmsQueryColors 3"
-	/tset/Xlib7/XcmsQueryColors/XcmsQueryColors
+	/Xlib7/XcmsQueryColors/XcmsQueryColors
 	"VSW5TESTSUITE CASE XcmsQueryGreen 1"
-	/tset/Xlib7/XcmsQueryGreen/XcmsQueryGreen
+	/Xlib7/XcmsQueryGreen/XcmsQueryGreen
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMaxC 1"
-	/tset/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC
+	/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMinL 1"
-	/tset/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL
+	/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMaxL 1"
-	/tset/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL
+	/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMaxLC 1"
-	/tset/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC
+	/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC
 	"VSW5TESTSUITE CASE XcmsQueryRed 1"
-	/tset/Xlib7/XcmsQueryRed/XcmsQueryRed
+	/Xlib7/XcmsQueryRed/XcmsQueryRed
 	"VSW5TESTSUITE CASE XcmsQueryWhite 1"
-	/tset/Xlib7/XcmsQueryWhite/XcmsQueryWhite
+	/Xlib7/XcmsQueryWhite/XcmsQueryWhite
 	"VSW5TESTSUITE CASE XcmsScreenNumberOfCCC 1"
-	/tset/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC
+	/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC
 	"VSW5TESTSUITE CASE XcmsStoreColor 4"
-	/tset/Xlib7/XcmsStoreColor/XcmsStoreColor
+	/Xlib7/XcmsStoreColor/XcmsStoreColor
 	"VSW5TESTSUITE CASE XcmsStoreColors 4"
-	/tset/Xlib7/XcmsStoreColors/XcmsStoreColors
+	/Xlib7/XcmsStoreColors/XcmsStoreColors
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxC 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC
+	/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMinV 1"
-	/tset/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV
+	/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxV 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV
+	/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxVC 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC
+	/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxVSamples 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples
+	/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples
 	"VSW5TESTSUITE CASE XcmsVisualOfCCC 1"
-	/tset/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC
+	/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC
 	"VSW5TESTSUITE CASE XcmsSetWhiteAdjustProc 3"
-	/tset/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc
+	/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc
 	"VSW5TESTSUITE CASE XcmsScreenWhitePointOfCCC 1"
-	/tset/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC
+	/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC
 	"VSW5TESTSUITE CASE XcmsClientWhitePointOfCCC 1"
-	/tset/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC
+	/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC
 	"VSW5TESTSUITE CASE XcmsSetWhitePoint 1"
-	/tset/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint
+	/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint
diff --git a/xts5/scenarios/Xlib8_scen b/xts5/scenarios/Xlib8_scen
index 718e8ace..a61bc1f5 100644
--- a/xts5/scenarios/Xlib8_scen
+++ b/xts5/scenarios/Xlib8_scen
@@ -56,60 +56,60 @@
 #
 
 	"VSW5TESTSUITE CASE XChangeGC 25"
-	/tset/Xlib8/XChangeGC/XChangeGC
+	/Xlib8/XChangeGC/XChangeGC
 	"VSW5TESTSUITE CASE XCopyGC 5"
-	/tset/Xlib8/XCopyGC/XCopyGC
+	/Xlib8/XCopyGC/XCopyGC
 	"VSW5TESTSUITE CASE XCreateGC 26"
-	/tset/Xlib8/XCreateGC/XCreateGC
+	/Xlib8/XCreateGC/XCreateGC
 	"VSW5TESTSUITE CASE XFreeGC 2"
-	/tset/Xlib8/XFreeGC/XFreeGC
+	/Xlib8/XFreeGC/XFreeGC
 	"VSW5TESTSUITE CASE XGContextFromGC 1"
-	/tset/Xlib8/XGContextFromGC/XGContextFromGC
+	/Xlib8/XGContextFromGC/XGContextFromGC
 	"VSW5TESTSUITE CASE XGetGCValues 3"
-	/tset/Xlib8/XGetGCValues/XGetGCValues
+	/Xlib8/XGetGCValues/XGetGCValues
 	"VSW5TESTSUITE CASE XQueryBestStipple 3"
-	/tset/Xlib8/XQueryBestStipple/XQueryBestStipple
+	/Xlib8/XQueryBestStipple/XQueryBestStipple
 	"VSW5TESTSUITE CASE XQueryBestSize 7"
-	/tset/Xlib8/XQueryBestSize/XQueryBestSize
+	/Xlib8/XQueryBestSize/XQueryBestSize
 	"VSW5TESTSUITE CASE XQueryBestTile 3"
-	/tset/Xlib8/XQueryBestTile/XQueryBestTile
+	/Xlib8/XQueryBestTile/XQueryBestTile
 	"VSW5TESTSUITE CASE XSetArcMode 4"
-	/tset/Xlib8/XSetArcMode/XSetArcMode
+	/Xlib8/XSetArcMode/XSetArcMode
 	"VSW5TESTSUITE CASE XSetBackground 3"
-	/tset/Xlib8/XSetBackground/XSetBackground
+	/Xlib8/XSetBackground/XSetBackground
 	"VSW5TESTSUITE CASE XSetClipMask 7"
-	/tset/Xlib8/XSetClipMask/XSetClipMask
+	/Xlib8/XSetClipMask/XSetClipMask
 	"VSW5TESTSUITE CASE XSetClipOrigin 3"
-	/tset/Xlib8/XSetClipOrigin/XSetClipOrigin
+	/Xlib8/XSetClipOrigin/XSetClipOrigin
 	"VSW5TESTSUITE CASE XSetClipRectangles 9"
-	/tset/Xlib8/XSetClipRectangles/XSetClipRectangles
+	/Xlib8/XSetClipRectangles/XSetClipRectangles
 	"VSW5TESTSUITE CASE XSetDashes 7"
-	/tset/Xlib8/XSetDashes/XSetDashes
+	/Xlib8/XSetDashes/XSetDashes
 	"VSW5TESTSUITE CASE XSetFillRule 4"
-	/tset/Xlib8/XSetFillRule/XSetFillRule
+	/Xlib8/XSetFillRule/XSetFillRule
 	"VSW5TESTSUITE CASE XSetFillStyle 4"
-	/tset/Xlib8/XSetFillStyle/XSetFillStyle
+	/Xlib8/XSetFillStyle/XSetFillStyle
 	"VSW5TESTSUITE CASE XSetFunction 4"
-	/tset/Xlib8/XSetFunction/XSetFunction
+	/Xlib8/XSetFunction/XSetFunction
 	"VSW5TESTSUITE CASE XSetFont 4"
-	/tset/Xlib8/XSetFont/XSetFont
+	/Xlib8/XSetFont/XSetFont
 	"VSW5TESTSUITE CASE XSetForeground 3"
-	/tset/Xlib8/XSetForeground/XSetForeground
+	/Xlib8/XSetForeground/XSetForeground
 	"VSW5TESTSUITE CASE XSetGraphicsExposures 4"
-	/tset/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures
+	/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures
 	"VSW5TESTSUITE CASE XSetLineAttributes 6"
-	/tset/Xlib8/XSetLineAttributes/XSetLineAttributes
+	/Xlib8/XSetLineAttributes/XSetLineAttributes
 	"VSW5TESTSUITE CASE XSetPlaneMask 3"
-	/tset/Xlib8/XSetPlaneMask/XSetPlaneMask
+	/Xlib8/XSetPlaneMask/XSetPlaneMask
 	"VSW5TESTSUITE CASE XSetSubwindowMode 4"
-	/tset/Xlib8/XSetSubwindowMode/XSetSubwindowMode
+	/Xlib8/XSetSubwindowMode/XSetSubwindowMode
 	"VSW5TESTSUITE CASE XSetStipple 6"
-	/tset/Xlib8/XSetStipple/XSetStipple
+	/Xlib8/XSetStipple/XSetStipple
 	"VSW5TESTSUITE CASE XSetState 4"
-	/tset/Xlib8/XSetState/XSetState
+	/Xlib8/XSetState/XSetState
 	"VSW5TESTSUITE CASE XSetTile 6"
-	/tset/Xlib8/XSetTile/XSetTile
+	/Xlib8/XSetTile/XSetTile
 	"VSW5TESTSUITE CASE XSetTSOrigin 3"
-	/tset/Xlib8/XSetTSOrigin/XSetTSOrigin
+	/Xlib8/XSetTSOrigin/XSetTSOrigin
 	"VSW5TESTSUITE CASE XFlushGC 2"
-	/tset/Xlib8/XFlushGC/XFlushGC
+	/Xlib8/XFlushGC/XFlushGC
diff --git a/xts5/scenarios/Xlib9_scen b/xts5/scenarios/Xlib9_scen
index f79b4b65..331c8e81 100644
--- a/xts5/scenarios/Xlib9_scen
+++ b/xts5/scenarios/Xlib9_scen
@@ -56,94 +56,94 @@
 #
 
 	"VSW5TESTSUITE CASE XClearArea 11"
-	/tset/Xlib9/XClearArea/XClearArea
+	/Xlib9/XClearArea/XClearArea
 	"VSW5TESTSUITE CASE XClearWindow 7"
-	/tset/Xlib9/XClearWindow/XClearWindow
+	/Xlib9/XClearWindow/XClearWindow
 	"VSW5TESTSUITE CASE XCopyArea 36"
-	/tset/Xlib9/XCopyArea/XCopyArea
+	/Xlib9/XCopyArea/XCopyArea
 	"VSW5TESTSUITE CASE XCopyPlane 43"
-	/tset/Xlib9/XCopyPlane/XCopyPlane
+	/Xlib9/XCopyPlane/XCopyPlane
 	"VSW5TESTSUITE CASE XDrawArc 102"
-	/tset/Xlib9/XDrawArc/XDrawArc
+	/Xlib9/XDrawArc/XDrawArc
 	"VSW5TESTSUITE CASE XDrawArcs 112"
-	/tset/Xlib9/XDrawArcs/XDrawArcs
+	/Xlib9/XDrawArcs/XDrawArcs
 	"VSW5TESTSUITE CASE XDrawImageString16 24"
-	/tset/Xlib9/XDrawImageString16/XDrawImageString16
+	/Xlib9/XDrawImageString16/XDrawImageString16
 	"VSW5TESTSUITE CASE XDrawImageString 24"
-	/tset/Xlib9/XDrawImageString/XDrawImageString
+	/Xlib9/XDrawImageString/XDrawImageString
 	"VSW5TESTSUITE CASE XDrawLine 91"
-	/tset/Xlib9/XDrawLine/XDrawLine
+	/Xlib9/XDrawLine/XDrawLine
 	"VSW5TESTSUITE CASE XDrawLines 104"
-	/tset/Xlib9/XDrawLines/XDrawLines
+	/Xlib9/XDrawLines/XDrawLines
 	"VSW5TESTSUITE CASE XDrawPoint 34"
-	/tset/Xlib9/XDrawPoint/XDrawPoint
+	/Xlib9/XDrawPoint/XDrawPoint
 	"VSW5TESTSUITE CASE XDrawPoints 38"
-	/tset/Xlib9/XDrawPoints/XDrawPoints
+	/Xlib9/XDrawPoints/XDrawPoints
 	"VSW5TESTSUITE CASE XDrawRectangle 83"
-	/tset/Xlib9/XDrawRectangle/XDrawRectangle
+	/Xlib9/XDrawRectangle/XDrawRectangle
 	"VSW5TESTSUITE CASE XDrawRectangles 85"
-	/tset/Xlib9/XDrawRectangles/XDrawRectangles
+	/Xlib9/XDrawRectangles/XDrawRectangles
 	"VSW5TESTSUITE CASE XDrawSegments 92"
-	/tset/Xlib9/XDrawSegments/XDrawSegments
+	/Xlib9/XDrawSegments/XDrawSegments
 	"VSW5TESTSUITE CASE XDrawString 44"
-	/tset/Xlib9/XDrawString/XDrawString
+	/Xlib9/XDrawString/XDrawString
 	"VSW5TESTSUITE CASE XDrawString16 44"
-	/tset/Xlib9/XDrawString16/XDrawString16
+	/Xlib9/XDrawString16/XDrawString16
 	"VSW5TESTSUITE CASE XDrawText 50"
-	/tset/Xlib9/XDrawText/XDrawText
+	/Xlib9/XDrawText/XDrawText
 	"VSW5TESTSUITE CASE XDrawText16 50"
-	/tset/Xlib9/XDrawText16/XDrawText16
+	/Xlib9/XDrawText16/XDrawText16
 	"VSW5TESTSUITE CASE XFillArc 44"
-	/tset/Xlib9/XFillArc/XFillArc
+	/Xlib9/XFillArc/XFillArc
 	"VSW5TESTSUITE CASE XFillArcs 46"
-	/tset/Xlib9/XFillArcs/XFillArcs
+	/Xlib9/XFillArcs/XFillArcs
 	"VSW5TESTSUITE CASE XFillPolygon 55"
-	/tset/Xlib9/XFillPolygon/XFillPolygon
+	/Xlib9/XFillPolygon/XFillPolygon
 	"VSW5TESTSUITE CASE XFillRectangle 43"
-	/tset/Xlib9/XFillRectangle/XFillRectangle
+	/Xlib9/XFillRectangle/XFillRectangle
 	"VSW5TESTSUITE CASE XFillRectangles 44"
-	/tset/Xlib9/XFillRectangles/XFillRectangles
+	/Xlib9/XFillRectangles/XFillRectangles
 	"VSW5TESTSUITE CASE XFreeFont 3"
-	/tset/Xlib9/XFreeFont/XFreeFont
+	/Xlib9/XFreeFont/XFreeFont
 	"VSW5TESTSUITE CASE XFreeFontInfo 2"
-	/tset/Xlib9/XFreeFontInfo/XFreeFontInfo
+	/Xlib9/XFreeFontInfo/XFreeFontInfo
 	"VSW5TESTSUITE CASE XFreeFontNames 1"
-	/tset/Xlib9/XFreeFontNames/XFreeFontNames
+	/Xlib9/XFreeFontNames/XFreeFontNames
 	"VSW5TESTSUITE CASE XFreeFontPath 1"
-	/tset/Xlib9/XFreeFontPath/XFreeFontPath
+	/Xlib9/XFreeFontPath/XFreeFontPath
 	"VSW5TESTSUITE CASE XGetFontProperty 2"
-	/tset/Xlib9/XGetFontProperty/XGetFontProperty
+	/Xlib9/XGetFontProperty/XGetFontProperty
 	"VSW5TESTSUITE CASE XGetFontPath 1"
-	/tset/Xlib9/XGetFontPath/XGetFontPath
+	/Xlib9/XGetFontPath/XGetFontPath
 	"VSW5TESTSUITE CASE XGetImage 17"
-	/tset/Xlib9/XGetImage/XGetImage
+	/Xlib9/XGetImage/XGetImage
 	"VSW5TESTSUITE CASE XGetSubImage 17"
-	/tset/Xlib9/XGetSubImage/XGetSubImage
+	/Xlib9/XGetSubImage/XGetSubImage
 	"VSW5TESTSUITE CASE XLoadFont 5"
-	/tset/Xlib9/XLoadFont/XLoadFont
+	/Xlib9/XLoadFont/XLoadFont
 	"VSW5TESTSUITE CASE XLoadQueryFont 5"
-	/tset/Xlib9/XLoadQueryFont/XLoadQueryFont
+	/Xlib9/XLoadQueryFont/XLoadQueryFont
 	"VSW5TESTSUITE CASE XListFonts 6"
-	/tset/Xlib9/XListFonts/XListFonts
+	/Xlib9/XListFonts/XListFonts
 	"VSW5TESTSUITE CASE XListFontsWithInfo 7"
-	/tset/Xlib9/XListFontsWithInfo/XListFontsWithInfo
+	/Xlib9/XListFontsWithInfo/XListFontsWithInfo
 	"VSW5TESTSUITE CASE XPutImage 40"
-	/tset/Xlib9/XPutImage/XPutImage
+	/Xlib9/XPutImage/XPutImage
 	"VSW5TESTSUITE CASE XQueryFont 3"
-	/tset/Xlib9/XQueryFont/XQueryFont
+	/Xlib9/XQueryFont/XQueryFont
 	"VSW5TESTSUITE CASE XQueryTextExtents16 13"
-	/tset/Xlib9/XQueryTextExtents16/XQueryTextExtents16
+	/Xlib9/XQueryTextExtents16/XQueryTextExtents16
 	"VSW5TESTSUITE CASE XQueryTextExtents 12"
-	/tset/Xlib9/XQueryTextExtents/XQueryTextExtents
+	/Xlib9/XQueryTextExtents/XQueryTextExtents
 	"VSW5TESTSUITE CASE XSetFontPath 4"
-	/tset/Xlib9/XSetFontPath/XSetFontPath
+	/Xlib9/XSetFontPath/XSetFontPath
 	"VSW5TESTSUITE CASE XTextExtents16 11"
-	/tset/Xlib9/XTextExtents16/XTextExtents16
+	/Xlib9/XTextExtents16/XTextExtents16
 	"VSW5TESTSUITE CASE XTextExtents 10"
-	/tset/Xlib9/XTextExtents/XTextExtents
+	/Xlib9/XTextExtents/XTextExtents
 	"VSW5TESTSUITE CASE XTextWidth 1"
-	/tset/Xlib9/XTextWidth/XTextWidth
+	/Xlib9/XTextWidth/XTextWidth
 	"VSW5TESTSUITE CASE XTextWidth16 2"
-	/tset/Xlib9/XTextWidth16/XTextWidth16
+	/Xlib9/XTextWidth16/XTextWidth16
 	"VSW5TESTSUITE CASE XUnloadFont 3"
-	/tset/Xlib9/XUnloadFont/XUnloadFont
+	/Xlib9/XUnloadFont/XUnloadFont
diff --git a/xts5/scenarios/Xopen_scen b/xts5/scenarios/Xopen_scen
index 060afa98..44c067c6 100644
--- a/xts5/scenarios/Xopen_scen
+++ b/xts5/scenarios/Xopen_scen
@@ -56,18 +56,18 @@
 #
 
 	"VSW5TESTSUITE CASE XAllocNamedColor 7"
-	/tset/Xopen/XAllocNamedColor/XAllocNamedColor
+	/Xopen/XAllocNamedColor/XAllocNamedColor
 	"VSW5TESTSUITE CASE cursorfont 32"
-	/tset/Xopen/cursorfont/cursorfont
+	/Xopen/cursorfont/cursorfont
 	"VSW5TESTSUITE CASE XCreateFontCursor 31"
-	/tset/Xopen/XCreateFontCursor/XCreateFontCursor
+	/Xopen/XCreateFontCursor/XCreateFontCursor
 	"VSW5TESTSUITE CASE keysym 7"
-	/tset/Xopen/keysym/keysym
+	/Xopen/keysym/keysym
 	"VSW5TESTSUITE CASE keysymdef 15"
-	/tset/Xopen/keysymdef/keysymdef
+	/Xopen/keysymdef/keysymdef
 	"VSW5TESTSUITE CASE XKeysymToKeycode 14"
-	/tset/Xopen/XKeysymToKeycode/XKeysymToKeycode
+	/Xopen/XKeysymToKeycode/XKeysymToKeycode
 	"VSW5TESTSUITE CASE XLookupColor 7"
-	/tset/Xopen/XLookupColor/XLookupColor
+	/Xopen/XLookupColor/XLookupColor
 	"VSW5TESTSUITE CASE XStringToKeysym 14"
-	/tset/Xopen/XStringToKeysym/XStringToKeysym
+	/Xopen/XStringToKeysym/XStringToKeysym
diff --git a/xts5/scenarios/Xproto_scen b/xts5/scenarios/Xproto_scen
index 594403fc..b6a1a398 100644
--- a/xts5/scenarios/Xproto_scen
+++ b/xts5/scenarios/Xproto_scen
@@ -56,246 +56,246 @@
 #
 
 	"VSW5TESTSUITE CASE AllocColor 3"
-	/tset/Xproto/pAllocColor/pAllocColor
+	/Xproto/pAllocColor/pAllocColor
 	"VSW5TESTSUITE CASE AllocColorCells 3"
-	/tset/Xproto/pAllocColorCells/pAllocColorCells
+	/Xproto/pAllocColorCells/pAllocColorCells
 	"VSW5TESTSUITE CASE AllocColorPlanes 3"
-	/tset/Xproto/pAllocColorPlanes/pAllocColorPlanes
+	/Xproto/pAllocColorPlanes/pAllocColorPlanes
 	"VSW5TESTSUITE CASE AllocNamedColor 3"
-	/tset/Xproto/pAllocNamedColor/pAllocNamedColor
+	/Xproto/pAllocNamedColor/pAllocNamedColor
 	"VSW5TESTSUITE CASE AllowEvents 3"
-	/tset/Xproto/pAllowEvents/pAllowEvents
+	/Xproto/pAllowEvents/pAllowEvents
 	"VSW5TESTSUITE CASE BadRequest 1"
-	/tset/Xproto/pBadRequest/pBadRequest
+	/Xproto/pBadRequest/pBadRequest
 	"VSW5TESTSUITE CASE Bell 3"
-	/tset/Xproto/pBell/pBell
+	/Xproto/pBell/pBell
 	"VSW5TESTSUITE CASE ChangeActivePointerGrab 3"
-	/tset/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab
+	/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab
 	"VSW5TESTSUITE CASE ChangeGC 4"
-	/tset/Xproto/pChangeGC/pChangeGC
+	/Xproto/pChangeGC/pChangeGC
 	"VSW5TESTSUITE CASE ChangeHosts 3"
-	/tset/Xproto/pChangeHosts/pChangeHosts
+	/Xproto/pChangeHosts/pChangeHosts
 	"VSW5TESTSUITE CASE ChangeKeyboardControl 4"
-	/tset/Xproto/pChangeKeyboardControl/pChangeKeyboardControl
+	/Xproto/pChangeKeyboardControl/pChangeKeyboardControl
 	"VSW5TESTSUITE CASE ChangeKeyboardMapping 3"
-	/tset/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping
+	/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping
 	"VSW5TESTSUITE CASE ChangePointerControl 3"
-	/tset/Xproto/pChangePointerControl/pChangePointerControl
+	/Xproto/pChangePointerControl/pChangePointerControl
 	"VSW5TESTSUITE CASE ChangeProperty 3"
-	/tset/Xproto/pChangeProperty/pChangeProperty
+	/Xproto/pChangeProperty/pChangeProperty
 	"VSW5TESTSUITE CASE ChangeSaveSet 3"
-	/tset/Xproto/pChangeSaveSet/pChangeSaveSet
+	/Xproto/pChangeSaveSet/pChangeSaveSet
 	"VSW5TESTSUITE CASE ChangeWindowAttributes 4"
-	/tset/Xproto/pChangeWindowAttributes/pChangeWindowAttributes
+	/Xproto/pChangeWindowAttributes/pChangeWindowAttributes
 	"VSW5TESTSUITE CASE ClearArea 3"
-	/tset/Xproto/pClearArea/pClearArea
+	/Xproto/pClearArea/pClearArea
 	"VSW5TESTSUITE CASE CloseFont 3"
-	/tset/Xproto/pCloseFont/pCloseFont
+	/Xproto/pCloseFont/pCloseFont
 	"VSW5TESTSUITE CASE ConfigureWindow 4"
-	/tset/Xproto/pConfigureWindow/pConfigureWindow
+	/Xproto/pConfigureWindow/pConfigureWindow
 	"VSW5TESTSUITE CASE ConvertSelection 3"
-	/tset/Xproto/pConvertSelection/pConvertSelection
+	/Xproto/pConvertSelection/pConvertSelection
 	"VSW5TESTSUITE CASE CopyArea 3"
-	/tset/Xproto/pCopyArea/pCopyArea
+	/Xproto/pCopyArea/pCopyArea
 	"VSW5TESTSUITE CASE CopyColormapAndFree 5"
-	/tset/Xproto/pCopyColormapAndFree/pCopyColormapAndFree
+	/Xproto/pCopyColormapAndFree/pCopyColormapAndFree
 	"VSW5TESTSUITE CASE CopyGC 4"
-	/tset/Xproto/pCopyGC/pCopyGC
+	/Xproto/pCopyGC/pCopyGC
 	"VSW5TESTSUITE CASE CopyPlane 3"
-	/tset/Xproto/pCopyPlane/pCopyPlane
+	/Xproto/pCopyPlane/pCopyPlane
 	"VSW5TESTSUITE CASE CirculateWindow 3"
-	/tset/Xproto/pCirculateWindow/pCirculateWindow
+	/Xproto/pCirculateWindow/pCirculateWindow
 	"VSW5TESTSUITE CASE CreateColormap 5"
-	/tset/Xproto/pCreateColormap/pCreateColormap
+	/Xproto/pCreateColormap/pCreateColormap
 	"VSW5TESTSUITE CASE CreateCursor 5"
-	/tset/Xproto/pCreateCursor/pCreateCursor
+	/Xproto/pCreateCursor/pCreateCursor
 	"VSW5TESTSUITE CASE CreateGC 6"
-	/tset/Xproto/pCreateGC/pCreateGC
+	/Xproto/pCreateGC/pCreateGC
 	"VSW5TESTSUITE CASE CreateGlyphCursor 5"
-	/tset/Xproto/pCreateGlyphCursor/pCreateGlyphCursor
+	/Xproto/pCreateGlyphCursor/pCreateGlyphCursor
 	"VSW5TESTSUITE CASE CreatePixmap 5"
-	/tset/Xproto/pCreatePixmap/pCreatePixmap
+	/Xproto/pCreatePixmap/pCreatePixmap
 	"VSW5TESTSUITE CASE CreateWindow 6"
-	/tset/Xproto/pCreateWindow/pCreateWindow
+	/Xproto/pCreateWindow/pCreateWindow
 	"VSW5TESTSUITE CASE DeleteProperty 3"
-	/tset/Xproto/pDeleteProperty/pDeleteProperty
+	/Xproto/pDeleteProperty/pDeleteProperty
 	"VSW5TESTSUITE CASE DestroySubwindows 3"
-	/tset/Xproto/pDestroySubwindows/pDestroySubwindows
+	/Xproto/pDestroySubwindows/pDestroySubwindows
 	"VSW5TESTSUITE CASE DestroyWindow 3"
-	/tset/Xproto/pDestroyWindow/pDestroyWindow
+	/Xproto/pDestroyWindow/pDestroyWindow
 	"VSW5TESTSUITE CASE FillPoly 3"
-	/tset/Xproto/pFillPoly/pFillPoly
+	/Xproto/pFillPoly/pFillPoly
 	"VSW5TESTSUITE CASE FreeColormap 3"
-	/tset/Xproto/pFreeColormap/pFreeColormap
+	/Xproto/pFreeColormap/pFreeColormap
 	"VSW5TESTSUITE CASE FreeColors 3"
-	/tset/Xproto/pFreeColors/pFreeColors
+	/Xproto/pFreeColors/pFreeColors
 	"VSW5TESTSUITE CASE FreeCursor 3"
-	/tset/Xproto/pFreeCursor/pFreeCursor
+	/Xproto/pFreeCursor/pFreeCursor
 	"VSW5TESTSUITE CASE ForceScreenSaver 3"
-	/tset/Xproto/pForceScreenSaver/pForceScreenSaver
+	/Xproto/pForceScreenSaver/pForceScreenSaver
 	"VSW5TESTSUITE CASE FreeGC 3"
-	/tset/Xproto/pFreeGC/pFreeGC
+	/Xproto/pFreeGC/pFreeGC
 	"VSW5TESTSUITE CASE FreePixmap 3"
-	/tset/Xproto/pFreePixmap/pFreePixmap
+	/Xproto/pFreePixmap/pFreePixmap
 	"VSW5TESTSUITE CASE GrabButton 3"
-	/tset/Xproto/pGrabButton/pGrabButton
+	/Xproto/pGrabButton/pGrabButton
 	"VSW5TESTSUITE CASE GrabKey 3"
-	/tset/Xproto/pGrabKey/pGrabKey
+	/Xproto/pGrabKey/pGrabKey
 	"VSW5TESTSUITE CASE GrabKeyboard 3"
-	/tset/Xproto/pGrabKeyboard/pGrabKeyboard
+	/Xproto/pGrabKeyboard/pGrabKeyboard
 	"VSW5TESTSUITE CASE GrabPointer 3"
-	/tset/Xproto/pGrabPointer/pGrabPointer
+	/Xproto/pGrabPointer/pGrabPointer
 	"VSW5TESTSUITE CASE GrabServer 3"
-	/tset/Xproto/pGrabServer/pGrabServer
+	/Xproto/pGrabServer/pGrabServer
 	"VSW5TESTSUITE CASE GetAtomName 3"
-	/tset/Xproto/pGetAtomName/pGetAtomName
+	/Xproto/pGetAtomName/pGetAtomName
 	"VSW5TESTSUITE CASE GetFontPath 3"
-	/tset/Xproto/pGetFontPath/pGetFontPath
+	/Xproto/pGetFontPath/pGetFontPath
 	"VSW5TESTSUITE CASE GetGeometry 3"
-	/tset/Xproto/pGetGeometry/pGetGeometry
+	/Xproto/pGetGeometry/pGetGeometry
 	"VSW5TESTSUITE CASE GetImage 3"
-	/tset/Xproto/pGetImage/pGetImage
+	/Xproto/pGetImage/pGetImage
 	"VSW5TESTSUITE CASE GetInputFocus 3"
-	/tset/Xproto/pGetInputFocus/pGetInputFocus
+	/Xproto/pGetInputFocus/pGetInputFocus
 	"VSW5TESTSUITE CASE GetKeyboardControl 3"
-	/tset/Xproto/pGetKeyboardControl/pGetKeyboardControl
+	/Xproto/pGetKeyboardControl/pGetKeyboardControl
 	"VSW5TESTSUITE CASE GetKeyboardMapping 3"
-	/tset/Xproto/pGetKeyboardMapping/pGetKeyboardMapping
+	/Xproto/pGetKeyboardMapping/pGetKeyboardMapping
 	"VSW5TESTSUITE CASE GetModifierMapping 3"
-	/tset/Xproto/pGetModifierMapping/pGetModifierMapping
+	/Xproto/pGetModifierMapping/pGetModifierMapping
 	"VSW5TESTSUITE CASE GetMotionEvents 3"
-	/tset/Xproto/pGetMotionEvents/pGetMotionEvents
+	/Xproto/pGetMotionEvents/pGetMotionEvents
 	"VSW5TESTSUITE CASE GetPointerControl 3"
-	/tset/Xproto/pGetPointerControl/pGetPointerControl
+	/Xproto/pGetPointerControl/pGetPointerControl
 	"VSW5TESTSUITE CASE GetPointerMapping 3"
-	/tset/Xproto/pGetPointerMapping/pGetPointerMapping
+	/Xproto/pGetPointerMapping/pGetPointerMapping
 	"VSW5TESTSUITE CASE GetProperty 3"
-	/tset/Xproto/pGetProperty/pGetProperty
+	/Xproto/pGetProperty/pGetProperty
 	"VSW5TESTSUITE CASE GetScreenSaver 3"
-	/tset/Xproto/pGetScreenSaver/pGetScreenSaver
+	/Xproto/pGetScreenSaver/pGetScreenSaver
 	"VSW5TESTSUITE CASE GetSelectionOwner 3"
-	/tset/Xproto/pGetSelectionOwner/pGetSelectionOwner
+	/Xproto/pGetSelectionOwner/pGetSelectionOwner
 	"VSW5TESTSUITE CASE GetWindowAttributes 3"
-	/tset/Xproto/pGetWindowAttributes/pGetWindowAttributes
+	/Xproto/pGetWindowAttributes/pGetWindowAttributes
 	"VSW5TESTSUITE CASE ImageText16 3"
-	/tset/Xproto/pImageText16/pImageText16
+	/Xproto/pImageText16/pImageText16
 	"VSW5TESTSUITE CASE ImageText8 3"
-	/tset/Xproto/pImageText8/pImageText8
+	/Xproto/pImageText8/pImageText8
 	"VSW5TESTSUITE CASE InstallColormap 3"
-	/tset/Xproto/pInstallColormap/pInstallColormap
+	/Xproto/pInstallColormap/pInstallColormap
 	"VSW5TESTSUITE CASE InternAtom 3"
-	/tset/Xproto/pInternAtom/pInternAtom
+	/Xproto/pInternAtom/pInternAtom
 	"VSW5TESTSUITE CASE KillClient 3"
-	/tset/Xproto/pKillClient/pKillClient
+	/Xproto/pKillClient/pKillClient
 	"VSW5TESTSUITE CASE LookupColor 3"
-	/tset/Xproto/pLookupColor/pLookupColor
+	/Xproto/pLookupColor/pLookupColor
 	"VSW5TESTSUITE CASE ListExtensions 3"
-	/tset/Xproto/pListExtensions/pListExtensions
+	/Xproto/pListExtensions/pListExtensions
 	"VSW5TESTSUITE CASE ListFonts 3"
-	/tset/Xproto/pListFonts/pListFonts
+	/Xproto/pListFonts/pListFonts
 	"VSW5TESTSUITE CASE ListFontsWithInfo 3"
-	/tset/Xproto/pListFontsWithInfo/pListFontsWithInfo
+	/Xproto/pListFontsWithInfo/pListFontsWithInfo
 	"VSW5TESTSUITE CASE ListHosts 3"
-	/tset/Xproto/pListHosts/pListHosts
+	/Xproto/pListHosts/pListHosts
 	"VSW5TESTSUITE CASE ListInstalledColormaps 3"
-	/tset/Xproto/pListInstalledColormaps/pListInstalledColormaps
+	/Xproto/pListInstalledColormaps/pListInstalledColormaps
 	"VSW5TESTSUITE CASE ListProperties 3"
-	/tset/Xproto/pListProperties/pListProperties
+	/Xproto/pListProperties/pListProperties
 	"VSW5TESTSUITE CASE MapSubwindows 3"
-	/tset/Xproto/pMapSubwindows/pMapSubwindows
+	/Xproto/pMapSubwindows/pMapSubwindows
 	"VSW5TESTSUITE CASE MapWindow 3"
-	/tset/Xproto/pMapWindow/pMapWindow
+	/Xproto/pMapWindow/pMapWindow
 	"VSW5TESTSUITE CASE NoOperation 4"
-	/tset/Xproto/pNoOperation/pNoOperation
+	/Xproto/pNoOperation/pNoOperation
 	"VSW5TESTSUITE CASE OpenDisplay 2"
-	/tset/Xproto/pOpenDisplay/pOpenDisplay
+	/Xproto/pOpenDisplay/pOpenDisplay
 	"VSW5TESTSUITE CASE OpenFont 5"
-	/tset/Xproto/pOpenFont/pOpenFont
+	/Xproto/pOpenFont/pOpenFont
 	"VSW5TESTSUITE CASE PolyArc 3"
-	/tset/Xproto/pPolyArc/pPolyArc
+	/Xproto/pPolyArc/pPolyArc
 	"VSW5TESTSUITE CASE PolyFillArc 3"
-	/tset/Xproto/pPolyFillArc/pPolyFillArc
+	/Xproto/pPolyFillArc/pPolyFillArc
 	"VSW5TESTSUITE CASE PolyFillRectangle 3"
-	/tset/Xproto/pPolyFillRectangle/pPolyFillRectangle
+	/Xproto/pPolyFillRectangle/pPolyFillRectangle
 	"VSW5TESTSUITE CASE PolyLine 3"
-	/tset/Xproto/pPolyLine/pPolyLine
+	/Xproto/pPolyLine/pPolyLine
 	"VSW5TESTSUITE CASE PolyPoint 3"
-	/tset/Xproto/pPolyPoint/pPolyPoint
+	/Xproto/pPolyPoint/pPolyPoint
 	"VSW5TESTSUITE CASE PolyRectangle 3"
-	/tset/Xproto/pPolyRectangle/pPolyRectangle
+	/Xproto/pPolyRectangle/pPolyRectangle
 	"VSW5TESTSUITE CASE PolySegment 3"
-	/tset/Xproto/pPolySegment/pPolySegment
+	/Xproto/pPolySegment/pPolySegment
 	"VSW5TESTSUITE CASE PolyText16 3"
-	/tset/Xproto/pPolyText16/pPolyText16
+	/Xproto/pPolyText16/pPolyText16
 	"VSW5TESTSUITE CASE PolyText8 3"
-	/tset/Xproto/pPolyText8/pPolyText8
+	/Xproto/pPolyText8/pPolyText8
 	"VSW5TESTSUITE CASE PutImage 3"
-	/tset/Xproto/pPutImage/pPutImage
+	/Xproto/pPutImage/pPutImage
 	"VSW5TESTSUITE CASE QueryBestSize 3"
-	/tset/Xproto/pQueryBestSize/pQueryBestSize
+	/Xproto/pQueryBestSize/pQueryBestSize
 	"VSW5TESTSUITE CASE QueryColors 3"
-	/tset/Xproto/pQueryColors/pQueryColors
+	/Xproto/pQueryColors/pQueryColors
 	"VSW5TESTSUITE CASE QueryExtension 3"
-	/tset/Xproto/pQueryExtension/pQueryExtension
+	/Xproto/pQueryExtension/pQueryExtension
 	"VSW5TESTSUITE CASE QueryFont 3"
-	/tset/Xproto/pQueryFont/pQueryFont
+	/Xproto/pQueryFont/pQueryFont
 	"VSW5TESTSUITE CASE QueryKeymap 3"
-	/tset/Xproto/pQueryKeymap/pQueryKeymap
+	/Xproto/pQueryKeymap/pQueryKeymap
 	"VSW5TESTSUITE CASE QueryPointer 3"
-	/tset/Xproto/pQueryPointer/pQueryPointer
+	/Xproto/pQueryPointer/pQueryPointer
 	"VSW5TESTSUITE CASE QueryTree 3"
-	/tset/Xproto/pQueryTree/pQueryTree
+	/Xproto/pQueryTree/pQueryTree
 	"VSW5TESTSUITE CASE QueryTextExtents 3"
-	/tset/Xproto/pQueryTextExtents/pQueryTextExtents
+	/Xproto/pQueryTextExtents/pQueryTextExtents
 	"VSW5TESTSUITE CASE RecolorCursor 3"
-	/tset/Xproto/pRecolorCursor/pRecolorCursor
+	/Xproto/pRecolorCursor/pRecolorCursor
 	"VSW5TESTSUITE CASE ReparentWindow 3"
-	/tset/Xproto/pReparentWindow/pReparentWindow
+	/Xproto/pReparentWindow/pReparentWindow
 	"VSW5TESTSUITE CASE RotateProperties 3"
-	/tset/Xproto/pRotateProperties/pRotateProperties
+	/Xproto/pRotateProperties/pRotateProperties
 	"VSW5TESTSUITE CASE SendEvent 3"
-	/tset/Xproto/pSendEvent/pSendEvent
+	/Xproto/pSendEvent/pSendEvent
 	"VSW5TESTSUITE CASE SetAccessControl 3"
-	/tset/Xproto/pSetAccessControl/pSetAccessControl
+	/Xproto/pSetAccessControl/pSetAccessControl
 	"VSW5TESTSUITE CASE SetClipRectangles 3"
-	/tset/Xproto/pSetClipRectangles/pSetClipRectangles
+	/Xproto/pSetClipRectangles/pSetClipRectangles
 	"VSW5TESTSUITE CASE SetCloseDownMode 3"
-	/tset/Xproto/pSetCloseDownMode/pSetCloseDownMode
+	/Xproto/pSetCloseDownMode/pSetCloseDownMode
 	"VSW5TESTSUITE CASE SetDashes 3"
-	/tset/Xproto/pSetDashes/pSetDashes
+	/Xproto/pSetDashes/pSetDashes
 	"VSW5TESTSUITE CASE SetFontPath 3"
-	/tset/Xproto/pSetFontPath/pSetFontPath
+	/Xproto/pSetFontPath/pSetFontPath
 	"VSW5TESTSUITE CASE SetInputFocus 3"
-	/tset/Xproto/pSetInputFocus/pSetInputFocus
+	/Xproto/pSetInputFocus/pSetInputFocus
 	"VSW5TESTSUITE CASE SetModifierMapping 3"
-	/tset/Xproto/pSetModifierMapping/pSetModifierMapping
+	/Xproto/pSetModifierMapping/pSetModifierMapping
 	"VSW5TESTSUITE CASE SetPointerMapping 3"
-	/tset/Xproto/pSetPointerMapping/pSetPointerMapping
+	/Xproto/pSetPointerMapping/pSetPointerMapping
 	"VSW5TESTSUITE CASE StoreColors 4"
-	/tset/Xproto/pStoreColors/pStoreColors
+	/Xproto/pStoreColors/pStoreColors
 	"VSW5TESTSUITE CASE StoreNamedColor 4"
-	/tset/Xproto/pStoreNamedColor/pStoreNamedColor
+	/Xproto/pStoreNamedColor/pStoreNamedColor
 	"VSW5TESTSUITE CASE SetScreenSaver 3"
-	/tset/Xproto/pSetScreenSaver/pSetScreenSaver
+	/Xproto/pSetScreenSaver/pSetScreenSaver
 	"VSW5TESTSUITE CASE SetSelectionOwner 3"
-	/tset/Xproto/pSetSelectionOwner/pSetSelectionOwner
+	/Xproto/pSetSelectionOwner/pSetSelectionOwner
 	"VSW5TESTSUITE CASE TranslateCoords 3"
-	/tset/Xproto/pTranslateCoords/pTranslateCoords
+	/Xproto/pTranslateCoords/pTranslateCoords
 	"VSW5TESTSUITE CASE UngrabButton 3"
-	/tset/Xproto/pUngrabButton/pUngrabButton
+	/Xproto/pUngrabButton/pUngrabButton
 	"VSW5TESTSUITE CASE UngrabKey 3"
-	/tset/Xproto/pUngrabKey/pUngrabKey
+	/Xproto/pUngrabKey/pUngrabKey
 	"VSW5TESTSUITE CASE UngrabKeyboard 3"
-	/tset/Xproto/pUngrabKeyboard/pUngrabKeyboard
+	/Xproto/pUngrabKeyboard/pUngrabKeyboard
 	"VSW5TESTSUITE CASE UngrabPointer 3"
-	/tset/Xproto/pUngrabPointer/pUngrabPointer
+	/Xproto/pUngrabPointer/pUngrabPointer
 	"VSW5TESTSUITE CASE UngrabServer 3"
-	/tset/Xproto/pUngrabServer/pUngrabServer
+	/Xproto/pUngrabServer/pUngrabServer
 	"VSW5TESTSUITE CASE UnmapSubwindows 3"
-	/tset/Xproto/pUnmapSubwindows/pUnmapSubwindows
+	/Xproto/pUnmapSubwindows/pUnmapSubwindows
 	"VSW5TESTSUITE CASE UnmapWindow 3"
-	/tset/Xproto/pUnmapWindow/pUnmapWindow
+	/Xproto/pUnmapWindow/pUnmapWindow
 	"VSW5TESTSUITE CASE UninstallColormap 3"
-	/tset/Xproto/pUninstallColormap/pUninstallColormap
+	/Xproto/pUninstallColormap/pUninstallColormap
 	"VSW5TESTSUITE CASE WarpPointer 3"
-	/tset/Xproto/pWarpPointer/pWarpPointer
+	/Xproto/pWarpPointer/pWarpPointer
diff --git a/xts5/scenarios/Xt10_scen b/xts5/scenarios/Xt10_scen
index e1cd044f..c22ca44b 100644
--- a/xts5/scenarios/Xt10_scen
+++ b/xts5/scenarios/Xt10_scen
@@ -59,18 +59,18 @@
 #
 
 	"VSW5TESTSUITE CASE XtAddCallback 3"
-	/tset/Xt10/XtAddCallback/XtAddCallback
+	/Xt10/XtAddCallback/XtAddCallback
 	"VSW5TESTSUITE CASE XtAddCallbacks 3"
-	/tset/Xt10/XtAddCallbacks/XtAddCallbacks
+	/Xt10/XtAddCallbacks/XtAddCallbacks
 	"VSW5TESTSUITE CASE XtRemoveCallback 2"
-	/tset/Xt10/XtRemoveCallback/XtRemoveCallback
+	/Xt10/XtRemoveCallback/XtRemoveCallback
 	"VSW5TESTSUITE CASE XtRemoveCallbacks 1"
-	/tset/Xt10/XtRemoveCallbacks/XtRemoveCallbacks
+	/Xt10/XtRemoveCallbacks/XtRemoveCallbacks
 	"VSW5TESTSUITE CASE XtRemoveAllCallbacks 2"
-	/tset/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks
+	/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks
 	"VSW5TESTSUITE CASE XtCallCallbacks 1"
-	/tset/Xt10/XtCallCallbacks/XtCallCallbacks
+	/Xt10/XtCallCallbacks/XtCallCallbacks
 	"VSW5TESTSUITE CASE XtCallCallbackList 2"
-	/tset/Xt10/XtCallCallbackList/XtCallCallbackList
+	/Xt10/XtCallCallbackList/XtCallCallbackList
 	"VSW5TESTSUITE CASE XtHasCallbacks 3"
-	/tset/Xt10/XtHasCallbacks/XtHasCallbacks
+	/Xt10/XtHasCallbacks/XtHasCallbacks
diff --git a/xts5/scenarios/Xt11_scen b/xts5/scenarios/Xt11_scen
index a667755a..a2ed6447 100644
--- a/xts5/scenarios/Xt11_scen
+++ b/xts5/scenarios/Xt11_scen
@@ -59,118 +59,118 @@
 #
 
 	"VSW5TESTSUITE CASE XtGetResourceList 2"
-	/tset/Xt11/XtGetResourceList/XtGetResourceList
+	/Xt11/XtGetResourceList/XtGetResourceList
 	"VSW5TESTSUITE CASE XtGetConstraintResourceList 3"
-	/tset/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList
+	/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList
 	"VSW5TESTSUITE CASE XtOffsetOf 1"
-	/tset/Xt11/XtOffsetOf/XtOffsetOf
+	/Xt11/XtOffsetOf/XtOffsetOf
 	"VSW5TESTSUITE CASE XtOffset 1"
-	/tset/Xt11/XtOffset/XtOffset
+	/Xt11/XtOffset/XtOffset
 	"VSW5TESTSUITE CASE XtGetSubresources 2"
-	/tset/Xt11/XtGetSubresources/XtGetSubresources
+	/Xt11/XtGetSubresources/XtGetSubresources
 	"VSW5TESTSUITE CASE XtVaGetSubresources 4"
-	/tset/Xt11/XtVaGetSubresources/XtVaGetSubresources
+	/Xt11/XtVaGetSubresources/XtVaGetSubresources
 	"VSW5TESTSUITE CASE XtGetApplicationResources 2"
-	/tset/Xt11/XtGetApplicationResources/XtGetApplicationResources
+	/Xt11/XtGetApplicationResources/XtGetApplicationResources
 	"VSW5TESTSUITE CASE XtVaGetApplicationResources 4"
-	/tset/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources
+	/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources
 	"VSW5TESTSUITE CASE XtCvtStringToAcceleratorTable 4"
-	/tset/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable
+	/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable
 	"VSW5TESTSUITE CASE XtCvtStringToAtom 4"
-	/tset/Xt11/XtCvtStringToAtom/XtCvtStringToAtom
+	/Xt11/XtCvtStringToAtom/XtCvtStringToAtom
 	"VSW5TESTSUITE CASE XtCvtStringToBoolean 4"
-	/tset/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean
+	/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean
 	"VSW5TESTSUITE CASE XtCvtStringToBool 4"
-	/tset/Xt11/XtCvtStringToBool/XtCvtStringToBool
+	/Xt11/XtCvtStringToBool/XtCvtStringToBool
 	"VSW5TESTSUITE CASE XtCvtStringToCursor 5"
-	/tset/Xt11/XtCvtStringToCursor/XtCvtStringToCursor
+	/Xt11/XtCvtStringToCursor/XtCvtStringToCursor
 	"VSW5TESTSUITE CASE XtCvtStringToDimension 4"
-	/tset/Xt11/XtCvtStringToDimension/XtCvtStringToDimension
+	/Xt11/XtCvtStringToDimension/XtCvtStringToDimension
 	"VSW5TESTSUITE CASE XtCvtStringToDisplay 4"
-	/tset/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay
+	/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay
 	"VSW5TESTSUITE CASE XtCvtStringToFile 4"
-	/tset/Xt11/XtCvtStringToFile/XtCvtStringToFile
+	/Xt11/XtCvtStringToFile/XtCvtStringToFile
 	"VSW5TESTSUITE CASE XtCvtStringToFloat 4"
-	/tset/Xt11/XtCvtStringToFloat/XtCvtStringToFloat
+	/Xt11/XtCvtStringToFloat/XtCvtStringToFloat
 	"VSW5TESTSUITE CASE XtCvtStringToFont 8"
-	/tset/Xt11/XtCvtStringToFont/XtCvtStringToFont
+	/Xt11/XtCvtStringToFont/XtCvtStringToFont
 	"VSW5TESTSUITE CASE XtCvtStringToFontSet 11"
-	/tset/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet
+	/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet
 	"VSW5TESTSUITE CASE XtCvtStringToFontStruct 8"
-	/tset/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct
+	/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct
 	"VSW5TESTSUITE CASE XtCvtStringToInitialState 6"
-	/tset/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState
+	/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState
 	"VSW5TESTSUITE CASE XtCvtStringToInt 4"
-	/tset/Xt11/XtCvtStringToInt/XtCvtStringToInt
+	/Xt11/XtCvtStringToInt/XtCvtStringToInt
 	"VSW5TESTSUITE CASE XtCvtStringToPixel 9"
-	/tset/Xt11/XtCvtStringToPixel/XtCvtStringToPixel
+	/Xt11/XtCvtStringToPixel/XtCvtStringToPixel
 	"VSW5TESTSUITE CASE XtCvtStringToShort 4"
-	/tset/Xt11/XtCvtStringToShort/XtCvtStringToShort
+	/Xt11/XtCvtStringToShort/XtCvtStringToShort
 	"VSW5TESTSUITE CASE XtCvtStringToTranslationTable 4"
-	/tset/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable
+	/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable
 	"VSW5TESTSUITE CASE XtCvtStringToPosition 4"
-	/tset/Xt11/XtCvtStringToPosition/XtCvtStringToPosition
+	/Xt11/XtCvtStringToPosition/XtCvtStringToPosition
 	"VSW5TESTSUITE CASE XtCvtStringToUnsignedChar 4"
-	/tset/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar
+	/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar
 	"VSW5TESTSUITE CASE XtCvtStringToVisual 5"
-	/tset/Xt11/XtCvtStringToVisual/XtCvtStringToVisual
+	/Xt11/XtCvtStringToVisual/XtCvtStringToVisual
 	"VSW5TESTSUITE CASE XtCvtColorToPixel 3"
-	/tset/Xt11/XtCvtColorToPixel/XtCvtColorToPixel
+	/Xt11/XtCvtColorToPixel/XtCvtColorToPixel
 	"VSW5TESTSUITE CASE XtCvtIntToBoolean 3"
-	/tset/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean
+	/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean
 	"VSW5TESTSUITE CASE XtCvtIntToBool 3"
-	/tset/Xt11/XtCvtIntToBool/XtCvtIntToBool
+	/Xt11/XtCvtIntToBool/XtCvtIntToBool
 	"VSW5TESTSUITE CASE XtCvtIntToColor 4"
-	/tset/Xt11/XtCvtIntToColor/XtCvtIntToColor
+	/Xt11/XtCvtIntToColor/XtCvtIntToColor
 	"VSW5TESTSUITE CASE XtCvtIntToDimension 3"
-	/tset/Xt11/XtCvtIntToDimension/XtCvtIntToDimension
+	/Xt11/XtCvtIntToDimension/XtCvtIntToDimension
 	"VSW5TESTSUITE CASE XtCvtIntToFloat 3"
-	/tset/Xt11/XtCvtIntToFloat/XtCvtIntToFloat
+	/Xt11/XtCvtIntToFloat/XtCvtIntToFloat
 	"VSW5TESTSUITE CASE XtCvtIntToFont 3"
-	/tset/Xt11/XtCvtIntToFont/XtCvtIntToFont
+	/Xt11/XtCvtIntToFont/XtCvtIntToFont
 	"VSW5TESTSUITE CASE XtCvtIntToPixel 3"
-	/tset/Xt11/XtCvtIntToPixel/XtCvtIntToPixel
+	/Xt11/XtCvtIntToPixel/XtCvtIntToPixel
 	"VSW5TESTSUITE CASE XtCvtIntToPixmap 3"
-	/tset/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap
+	/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap
 	"VSW5TESTSUITE CASE XtCvtIntToPosition 3"
-	/tset/Xt11/XtCvtIntToPosition/XtCvtIntToPosition
+	/Xt11/XtCvtIntToPosition/XtCvtIntToPosition
 	"VSW5TESTSUITE CASE XtCvtIntToShort 3"
-	/tset/Xt11/XtCvtIntToShort/XtCvtIntToShort
+	/Xt11/XtCvtIntToShort/XtCvtIntToShort
 	"VSW5TESTSUITE CASE XtCvtIntToUnsignedChar 3"
-	/tset/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar
+	/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar
 	"VSW5TESTSUITE CASE XtCvtPixelToColor 3"
-	/tset/Xt11/XtCvtPixelToColor/XtCvtPixelToColor
+	/Xt11/XtCvtPixelToColor/XtCvtPixelToColor
 	"VSW5TESTSUITE CASE XtDisplayStringConversionWarning 2"
-	/tset/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning
+	/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning
 	"VSW5TESTSUITE CASE XtDisplayToApplicationContext 2"
-	/tset/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext
+	/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext
 	"VSW5TESTSUITE CASE XtSetTypeConverter 15"
-	/tset/Xt11/XtSetTypeConverter/XtSetTypeConverter
+	/Xt11/XtSetTypeConverter/XtSetTypeConverter
 	"VSW5TESTSUITE CASE XtAppSetTypeConverter 15"
-	/tset/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter
+	/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter
 	"VSW5TESTSUITE CASE XtCallConverter 15"
-	/tset/Xt11/XtCallConverter/XtCallConverter
+	/Xt11/XtCallConverter/XtCallConverter
 	"VSW5TESTSUITE CASE XtAppReleaseCacheRefs 2"
-	/tset/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs
+	/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs
 	"VSW5TESTSUITE CASE XtCallbackReleaseCacheRef 1"
-	/tset/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef
+	/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef
 	"VSW5TESTSUITE CASE XtCallbackReleaseCacheRefList 1"
-	/tset/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList
+	/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList
 	"VSW5TESTSUITE CASE XtConvertAndStore 18"
-	/tset/Xt11/XtConvertAndStore/XtConvertAndStore
+	/Xt11/XtConvertAndStore/XtConvertAndStore
 	"VSW5TESTSUITE CASE XtGetValues 5"
-	/tset/Xt11/XtGetValues/XtGetValues
+	/Xt11/XtGetValues/XtGetValues
 	"VSW5TESTSUITE CASE XtVaGetValues 7"
-	/tset/Xt11/XtVaGetValues/XtVaGetValues
+	/Xt11/XtVaGetValues/XtVaGetValues
 	"VSW5TESTSUITE CASE XtGetSubvalues 2"
-	/tset/Xt11/XtGetSubvalues/XtGetSubvalues
+	/Xt11/XtGetSubvalues/XtGetSubvalues
 	"VSW5TESTSUITE CASE XtVaGetSubvalues 3"
-	/tset/Xt11/XtVaGetSubvalues/XtVaGetSubvalues
+	/Xt11/XtVaGetSubvalues/XtVaGetSubvalues
 	"VSW5TESTSUITE CASE XtSetValues 13"
-	/tset/Xt11/XtSetValues/XtSetValues
+	/Xt11/XtSetValues/XtSetValues
 	"VSW5TESTSUITE CASE XtVaSetValues 15"
-	/tset/Xt11/XtVaSetValues/XtVaSetValues
+	/Xt11/XtVaSetValues/XtVaSetValues
 	"VSW5TESTSUITE CASE XtSetSubvalues 2"
-	/tset/Xt11/XtSetSubvalues/XtSetSubvalues
+	/Xt11/XtSetSubvalues/XtSetSubvalues
 	"VSW5TESTSUITE CASE XtVaSetSubvalues 4"
-	/tset/Xt11/XtVaSetSubvalues/XtVaSetSubvalues
+	/Xt11/XtVaSetSubvalues/XtVaSetSubvalues
diff --git a/xts5/scenarios/Xt12_scen b/xts5/scenarios/Xt12_scen
index 48e8fac4..ff3d4a24 100644
--- a/xts5/scenarios/Xt12_scen
+++ b/xts5/scenarios/Xt12_scen
@@ -59,46 +59,46 @@
 #
 
 	"VSW5TESTSUITE CASE XtAppAddActions 4"
-	/tset/Xt12/XtAppAddActions/XtAppAddActions
+	/Xt12/XtAppAddActions/XtAppAddActions
 	"VSW5TESTSUITE CASE XtAppAddActionHook 6"
-	/tset/Xt12/XtAppAddActionHook/XtAppAddActionHook
+	/Xt12/XtAppAddActionHook/XtAppAddActionHook
 	"VSW5TESTSUITE CASE XtRemoveActionHook 1"
-	/tset/Xt12/XtRemoveActionHook/XtRemoveActionHook
+	/Xt12/XtRemoveActionHook/XtRemoveActionHook
 	"VSW5TESTSUITE CASE XtSetMultiClickTime 1"
-	/tset/Xt12/XtSetMultiClickTime/XtSetMultiClickTime
+	/Xt12/XtSetMultiClickTime/XtSetMultiClickTime
 	"VSW5TESTSUITE CASE XtGetMultiClickTime 2"
-	/tset/Xt12/XtGetMultiClickTime/XtGetMultiClickTime
+	/Xt12/XtGetMultiClickTime/XtGetMultiClickTime
 	"VSW5TESTSUITE CASE XtParseTranslationTable 1"
-	/tset/Xt12/XtParseTranslationTable/XtParseTranslationTable
+	/Xt12/XtParseTranslationTable/XtParseTranslationTable
 	"VSW5TESTSUITE CASE XtAugmentTranslations 4"
-	/tset/Xt12/XtAugmentTranslations/XtAugmentTranslations
+	/Xt12/XtAugmentTranslations/XtAugmentTranslations
 	"VSW5TESTSUITE CASE XtOverrideTranslations 4"
-	/tset/Xt12/XtOverrideTranslations/XtOverrideTranslations
+	/Xt12/XtOverrideTranslations/XtOverrideTranslations
 	"VSW5TESTSUITE CASE XtUninstallTranslations 1"
-	/tset/Xt12/XtUninstallTranslations/XtUninstallTranslations
+	/Xt12/XtUninstallTranslations/XtUninstallTranslations
 	"VSW5TESTSUITE CASE XtParseAcceleratorTable 1"
-	/tset/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable
+	/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable
 	"VSW5TESTSUITE CASE XtInstallAccelerators 2"
-	/tset/Xt12/XtInstallAccelerators/XtInstallAccelerators
+	/Xt12/XtInstallAccelerators/XtInstallAccelerators
 	"VSW5TESTSUITE CASE XtInstallAllAccelerators 1"
-	/tset/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators
+	/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators
 	"VSW5TESTSUITE CASE XtGetKeysymTable 4"
-	/tset/Xt12/XtGetKeysymTable/XtGetKeysymTable
+	/Xt12/XtGetKeysymTable/XtGetKeysymTable
 	"VSW5TESTSUITE CASE XtSetKeyTranslator 1"
-	/tset/Xt12/XtSetKeyTranslator/XtSetKeyTranslator
+	/Xt12/XtSetKeyTranslator/XtSetKeyTranslator
 	"VSW5TESTSUITE CASE XtTranslateKeycode 2"
-	/tset/Xt12/XtTranslateKeycode/XtTranslateKeycode
+	/Xt12/XtTranslateKeycode/XtTranslateKeycode
 	"VSW5TESTSUITE CASE XtRegisterCaseConverter 2"
-	/tset/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter
+	/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter
 	"VSW5TESTSUITE CASE XtConvertCase 2"
-	/tset/Xt12/XtConvertCase/XtConvertCase
+	/Xt12/XtConvertCase/XtConvertCase
 	"VSW5TESTSUITE CASE XtGetActionKeysym 8"
-	/tset/Xt12/XtGetActionKeysym/XtGetActionKeysym
+	/Xt12/XtGetActionKeysym/XtGetActionKeysym
 	"VSW5TESTSUITE CASE XtKeysymToKeycodeList 2"
-	/tset/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList
+	/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList
 	"VSW5TESTSUITE CASE XtCallActionProc 2"
-	/tset/Xt12/XtCallActionProc/XtCallActionProc
+	/Xt12/XtCallActionProc/XtCallActionProc
 	"VSW5TESTSUITE CASE XtRegisterGrabAction 11"
-	/tset/Xt12/XtRegisterGrabAction/XtRegisterGrabAction
+	/Xt12/XtRegisterGrabAction/XtRegisterGrabAction
 	"VSW5TESTSUITE CASE XtGetActionList 5"
-	/tset/Xt12/XtGetActionList/XtGetActionList
+	/Xt12/XtGetActionList/XtGetActionList
diff --git a/xts5/scenarios/Xt13_scen b/xts5/scenarios/Xt13_scen
index 3a5f1d68..b003dd7a 100644
--- a/xts5/scenarios/Xt13_scen
+++ b/xts5/scenarios/Xt13_scen
@@ -59,80 +59,80 @@
 #
 
 	"VSW5TESTSUITE CASE XtNumber 1"
-	/tset/Xt13/XtNumber/XtNumber
+	/Xt13/XtNumber/XtNumber
 	"VSW5TESTSUITE CASE XtNameToWidget 7"
-	/tset/Xt13/XtNameToWidget/XtNameToWidget
+	/Xt13/XtNameToWidget/XtNameToWidget
 	"VSW5TESTSUITE CASE XtMalloc 6"
-	/tset/Xt13/XtMalloc/XtMalloc
+	/Xt13/XtMalloc/XtMalloc
 	"VSW5TESTSUITE CASE XtCalloc 6"
-	/tset/Xt13/XtCalloc/XtCalloc
+	/Xt13/XtCalloc/XtCalloc
 	"VSW5TESTSUITE CASE XtRealloc 12"
-	/tset/Xt13/XtRealloc/XtRealloc
+	/Xt13/XtRealloc/XtRealloc
 	"VSW5TESTSUITE CASE XtFree 4"
-	/tset/Xt13/XtFree/XtFree
+	/Xt13/XtFree/XtFree
 	"VSW5TESTSUITE CASE XtNew 5"
-	/tset/Xt13/XtNew/XtNew
+	/Xt13/XtNew/XtNew
 	"VSW5TESTSUITE CASE XtNewString 5"
-	/tset/Xt13/XtNewString/XtNewString
+	/Xt13/XtNewString/XtNewString
 	"VSW5TESTSUITE CASE XtAllocateGC 9"
-	/tset/Xt13/XtAllocateGC/XtAllocateGC
+	/Xt13/XtAllocateGC/XtAllocateGC
 	"VSW5TESTSUITE CASE XtGetGC 4"
-	/tset/Xt13/XtGetGC/XtGetGC
+	/Xt13/XtGetGC/XtGetGC
 	"VSW5TESTSUITE CASE XtReleaseGC 2"
-	/tset/Xt13/XtReleaseGC/XtReleaseGC
+	/Xt13/XtReleaseGC/XtReleaseGC
 	"VSW5TESTSUITE CASE XtAppSetSelectionTimeout 1"
-	/tset/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout
+	/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout
 	"VSW5TESTSUITE CASE XtAppGetSelectionTimeout 2"
-	/tset/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout
+	/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout
 	"VSW5TESTSUITE CASE XtGetSelectionRequest 3"
-	/tset/Xt13/XtGetSelectionRequest/XtGetSelectionRequest
+	/Xt13/XtGetSelectionRequest/XtGetSelectionRequest
 	"VSW5TESTSUITE CASE XtGetSelectionValue 4"
-	/tset/Xt13/XtGetSelectionValue/XtGetSelectionValue
+	/Xt13/XtGetSelectionValue/XtGetSelectionValue
 	"VSW5TESTSUITE CASE XtGetSelectionValues 5"
-	/tset/Xt13/XtGetSelectionValues/XtGetSelectionValues
+	/Xt13/XtGetSelectionValues/XtGetSelectionValues
 	"VSW5TESTSUITE CASE XtOwnSelection 8"
-	/tset/Xt13/XtOwnSelection/XtOwnSelection
+	/Xt13/XtOwnSelection/XtOwnSelection
 	"VSW5TESTSUITE CASE XtDisownSelection 5"
-	/tset/Xt13/XtDisownSelection/XtDisownSelection
+	/Xt13/XtDisownSelection/XtDisownSelection
 	"VSW5TESTSUITE CASE XtGetSelectionValueIncremental 6"
-	/tset/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental
+	/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental
 	"VSW5TESTSUITE CASE XtGetSelectionValuesIncremental 7"
-	/tset/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental
+	/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental
 	"VSW5TESTSUITE CASE XtOwnSelectionIncremental 10"
-	/tset/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental
+	/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental
 	"VSW5TESTSUITE CASE XtLastTimestampProcessed 2"
-	/tset/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed
+	/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed
 	"VSW5TESTSUITE CASE XtAddExposureToRegion 3"
-	/tset/Xt13/XtAddExposureToRegion/XtAddExposureToRegion
+	/Xt13/XtAddExposureToRegion/XtAddExposureToRegion
 	"VSW5TESTSUITE CASE XtTranslateCoords 1"
-	/tset/Xt13/XtTranslateCoords/XtTranslateCoords
+	/Xt13/XtTranslateCoords/XtTranslateCoords
 	"VSW5TESTSUITE CASE XtWindowToWidget 2"
-	/tset/Xt13/XtWindowToWidget/XtWindowToWidget
+	/Xt13/XtWindowToWidget/XtWindowToWidget
 	"VSW5TESTSUITE CASE XtGetApplicationNameAndClass 3"
-	/tset/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass
+	/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass
 	"VSW5TESTSUITE CASE XtAppGetErrorDatabase 1"
-	/tset/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase
+	/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase
 	"VSW5TESTSUITE CASE XtAppGetErrorDatabaseText 4"
-	/tset/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText
+	/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText
 	"VSW5TESTSUITE CASE XtAppSetErrorMsgHandler 2"
-	/tset/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler
+	/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler
 	"VSW5TESTSUITE CASE XtAppErrorMsg 3"
-	/tset/Xt13/XtAppErrorMsg/XtAppErrorMsg
+	/Xt13/XtAppErrorMsg/XtAppErrorMsg
 	"VSW5TESTSUITE CASE XtAppSetWarningMsgHandler 2"
-	/tset/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler
+	/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler
 	"VSW5TESTSUITE CASE XtAppWarningMsg 3"
-	/tset/Xt13/XtAppWarningMsg/XtAppWarningMsg
+	/Xt13/XtAppWarningMsg/XtAppWarningMsg
 	"VSW5TESTSUITE CASE XtAppSetErrorHandler 2"
-	/tset/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler
+	/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler
 	"VSW5TESTSUITE CASE XtAppError 3"
-	/tset/Xt13/XtAppError/XtAppError
+	/Xt13/XtAppError/XtAppError
 	"VSW5TESTSUITE CASE XtAppSetWarningHandler 2"
-	/tset/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler
+	/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler
 	"VSW5TESTSUITE CASE XtAppWarning 3"
-	/tset/Xt13/XtAppWarning/XtAppWarning
+	/Xt13/XtAppWarning/XtAppWarning
 	"VSW5TESTSUITE CASE XtSetWMColormapWindows 3"
-	/tset/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows
+	/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows
 	"VSW5TESTSUITE CASE XtFindFile 7"
-	/tset/Xt13/XtFindFile/XtFindFile
+	/Xt13/XtFindFile/XtFindFile
 	"VSW5TESTSUITE CASE XtResolvePathname 20"
-	/tset/Xt13/XtResolvePathname/XtResolvePathname
+	/Xt13/XtResolvePathname/XtResolvePathname
diff --git a/xts5/scenarios/Xt14_scen b/xts5/scenarios/Xt14_scen
index d0334670..757f5b54 100644
--- a/xts5/scenarios/Xt14_scen
+++ b/xts5/scenarios/Xt14_scen
@@ -59,6 +59,6 @@
 #
 
 	"VSW5TESTSUITE CASE ObjectObject 9"
-	/tset/Xt14/ObjectObject/ObjectObject
+	/Xt14/ObjectObject/ObjectObject
 	"VSW5TESTSUITE CASE RectangleObject 9"
-	/tset/Xt14/RectangleObject/RectangleObject
+	/Xt14/RectangleObject/RectangleObject
diff --git a/xts5/scenarios/Xt15_scen b/xts5/scenarios/Xt15_scen
index 87a5d9db..eb35475e 100644
--- a/xts5/scenarios/Xt15_scen
+++ b/xts5/scenarios/Xt15_scen
@@ -59,4 +59,4 @@
 #
 
 	"VSW5TESTSUITE CASE XtSpecificationRelease 2"
-	/tset/Xt15/XtSpecificationRelease/XtSpecificationRelease
+	/Xt15/XtSpecificationRelease/XtSpecificationRelease
diff --git a/xts5/scenarios/Xt3_scen b/xts5/scenarios/Xt3_scen
index 668300c7..417b49bb 100644
--- a/xts5/scenarios/Xt3_scen
+++ b/xts5/scenarios/Xt3_scen
@@ -59,44 +59,44 @@
 #
 
 	"VSW5TESTSUITE CASE DataTypes 9"
-	/tset/Xt3/DataTypes/DataTypes
+	/Xt3/DataTypes/DataTypes
 	"VSW5TESTSUITE CASE CoreWidget 9"
-	/tset/Xt3/CoreWidget/CoreWidget
+	/Xt3/CoreWidget/CoreWidget
 	"VSW5TESTSUITE CASE CompositeWidget 11"
-	/tset/Xt3/CompositeWidget/CompositeWidget
+	/Xt3/CompositeWidget/CompositeWidget
 	"VSW5TESTSUITE CASE ConstraintWidget 11"
-	/tset/Xt3/ConstraintWidget/ConstraintWidget
+	/Xt3/ConstraintWidget/ConstraintWidget
 	"VSW5TESTSUITE CASE XtClass 1"
-	/tset/Xt3/XtClass/XtClass
+	/Xt3/XtClass/XtClass
 	"VSW5TESTSUITE CASE XtSuperClass 1"
-	/tset/Xt3/XtSuperClass/XtSuperClass
+	/Xt3/XtSuperClass/XtSuperClass
 	"VSW5TESTSUITE CASE XtIsSubclass 2"
-	/tset/Xt3/XtIsSubclass/XtIsSubclass
+	/Xt3/XtIsSubclass/XtIsSubclass
 	"VSW5TESTSUITE CASE XtIsObject 2"
-	/tset/Xt3/XtIsObject/XtIsObject
+	/Xt3/XtIsObject/XtIsObject
 	"VSW5TESTSUITE CASE XtIsRectObj 2"
-	/tset/Xt3/XtIsRectObject/XtIsRectObject
+	/Xt3/XtIsRectObject/XtIsRectObject
 	"VSW5TESTSUITE CASE XtIsWidget 2"
-	/tset/Xt3/XtIsWidget/XtIsWidget
+	/Xt3/XtIsWidget/XtIsWidget
 	"VSW5TESTSUITE CASE XtIsComposite 2"
-	/tset/Xt3/XtIsComposite/XtIsComposite
+	/Xt3/XtIsComposite/XtIsComposite
 	"VSW5TESTSUITE CASE XtIsConstraint 2"
-	/tset/Xt3/XtIsConstraint/XtIsConstraint
+	/Xt3/XtIsConstraint/XtIsConstraint
 	"VSW5TESTSUITE CASE XtIsShell 2"
-	/tset/Xt3/XtIsShell/XtIsShell
+	/Xt3/XtIsShell/XtIsShell
 	"VSW5TESTSUITE CASE XtIsOverrideShell 2"
-	/tset/Xt3/XtIsOverrideShell/XtIsOverrideShell
+	/Xt3/XtIsOverrideShell/XtIsOverrideShell
 	"VSW5TESTSUITE CASE XtIsWMShell 2"
-	/tset/Xt3/XtIsWMShell/XtIsWMShell
+	/Xt3/XtIsWMShell/XtIsWMShell
 	"VSW5TESTSUITE CASE XtIsVendorShell 2"
-	/tset/Xt3/XtIsVendorShell/XtIsVendorShell
+	/Xt3/XtIsVendorShell/XtIsVendorShell
 	"VSW5TESTSUITE CASE XtIsTransientShell 2"
-	/tset/Xt3/XtIsTransientShell/XtIsTransientShell
+	/Xt3/XtIsTransientShell/XtIsTransientShell
 	"VSW5TESTSUITE CASE XtIsTopLevelShell 2"
-	/tset/Xt3/XtIsTopLevelShell/XtIsTopLevelShell
+	/Xt3/XtIsTopLevelShell/XtIsTopLevelShell
 	"VSW5TESTSUITE CASE XtIsApplicationShell 2"
-	/tset/Xt3/XtIsApplicationShell/XtIsApplicationShell
+	/Xt3/XtIsApplicationShell/XtIsApplicationShell
 	"VSW5TESTSUITE CASE XtCheckSubclass 3"
-	/tset/Xt3/XtCheckSubclass/XtCheckSubclass
+	/Xt3/XtCheckSubclass/XtCheckSubclass
 	"VSW5TESTSUITE CASE XtInitializeWidgetClass 2"
-	/tset/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass
+	/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass
diff --git a/xts5/scenarios/Xt4_scen b/xts5/scenarios/Xt4_scen
index af8ad46d..eab9f982 100644
--- a/xts5/scenarios/Xt4_scen
+++ b/xts5/scenarios/Xt4_scen
@@ -62,68 +62,68 @@
 #
 
 	"VSW5TESTSUITE CASE XtToolkitInitialize 1"
-	/tset/Xt4/XtToolkitInitialize/XtToolkitInitialize
+	/Xt4/XtToolkitInitialize/XtToolkitInitialize
 	"VSW5TESTSUITE CASE XtCreateApplicationContext 1"
-	/tset/Xt4/XtCreateApplicationContext/XtCreateApplicationContext
+	/Xt4/XtCreateApplicationContext/XtCreateApplicationContext
 	"VSW5TESTSUITE CASE XtDestoryApplicationContext 2"
-	/tset/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext
+	/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext
 	"VSW5TESTSUITE CASE XtWidgetToApplicationContext 1"
-	/tset/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext
+	/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext
 	"VSW5TESTSUITE CASE XtDisplayInitialize 20"
-	/tset/Xt4/XtDisplayInitialize/XtDisplayInitialize
+	/Xt4/XtDisplayInitialize/XtDisplayInitialize
 	"VSW5TESTSUITE CASE XtOpenDisplay 28"
-	/tset/Xt4/XtOpenDisplay/XtOpenDisplay
+	/Xt4/XtOpenDisplay/XtOpenDisplay
 	"VSW5TESTSUITE CASE XtCloseDisplay 2"
-	/tset/Xt4/XtCloseDisplay/XtCloseDisplay
+	/Xt4/XtCloseDisplay/XtCloseDisplay
 	"VSW5TESTSUITE CASE XtSetLanguageProc 8"
-	/tset/Xt4/XtSetLanguageProc/XtSetLanguageProc
+	/Xt4/XtSetLanguageProc/XtSetLanguageProc
 	"VSW5TESTSUITE CASE XtScreenDatabase 1"
-	/tset/Xt4/XtScreenDatabase/XtScreenDatabase
+	/Xt4/XtScreenDatabase/XtScreenDatabase
 	"VSW5TESTSUITE CASE XtDatabase 2"
-	/tset/Xt4/XtDatabase/XtDatabase
+	/Xt4/XtDatabase/XtDatabase
 	"VSW5TESTSUITE CASE XtAppSetFallbackResources 2"
-	/tset/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources
+	/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources
 	"VSW5TESTSUITE CASE XtSetArg 2"
-	/tset/Xt4/XtSetArg/XtSetArg
+	/Xt4/XtSetArg/XtSetArg
 	"VSW5TESTSUITE CASE XtMergeArgLists 3"
-	/tset/Xt4/XtMergeArgLists/XtMergeArgLists
+	/Xt4/XtMergeArgLists/XtMergeArgLists
 	"VSW5TESTSUITE CASE XtVaCreateArgsList 2"
-	/tset/Xt4/XtCreateVarArgsList/XtCreateVarArgsList
+	/Xt4/XtCreateVarArgsList/XtCreateVarArgsList
 	"VSW5TESTSUITE CASE XtCreateWidget 4"
-	/tset/Xt4/XtCreateWidget/XtCreateWidget
+	/Xt4/XtCreateWidget/XtCreateWidget
 	"VSW5TESTSUITE CASE XtVaCreateWidget 8"
-	/tset/Xt4/XtVaCreateWidget/XtVaCreateWidget
+	/Xt4/XtVaCreateWidget/XtVaCreateWidget
 	"VSW5TESTSUITE CASE XtAppCreateShell 7"
-	/tset/Xt4/XtAppCreateShell/XtAppCreateShell
+	/Xt4/XtAppCreateShell/XtAppCreateShell
 	"VSW5TESTSUITE CASE XtVaAppCreateShell 7"
-	/tset/Xt4/XtVaAppCreateShell/XtVaAppCreateShell
+	/Xt4/XtVaAppCreateShell/XtVaAppCreateShell
 	"VSW5TESTSUITE CASE XtAppInitialize 29"
-	/tset/Xt4/XtAppInitialize/XtAppInitialize
+	/Xt4/XtAppInitialize/XtAppInitialize
 	"VSW5TESTSUITE CASE XtVaAppInitialize 29"
-	/tset/Xt4/XtVaAppInitialize/XtVaAppInitialize
+	/Xt4/XtVaAppInitialize/XtVaAppInitialize
 	"VSW5TESTSUITE CASE XtRealizeWidget 11"
-	/tset/Xt4/XtRealizeWidget/XtRealizeWidget
+	/Xt4/XtRealizeWidget/XtRealizeWidget
 	"VSW5TESTSUITE CASE XtIsRealized 3"
-	/tset/Xt4/XtIsRealized/XtIsRealized
+	/Xt4/XtIsRealized/XtIsRealized
 	"VSW5TESTSUITE CASE XtCreateWindow 1"
-	/tset/Xt4/XtCreateWindow/XtCreateWindow
+	/Xt4/XtCreateWindow/XtCreateWindow
 	"VSW5TESTSUITE CASE XtDisplay 1"
-      	/tset/Xt4/XtDisplay/XtDisplay
+      	/Xt4/XtDisplay/XtDisplay
 	"VSW5TESTSUITE CASE XtParent 1"
-	/tset/Xt4/XtParent/XtParent
+	/Xt4/XtParent/XtParent
 	"VSW5TESTSUITE CASE XtScreen 1"
-	/tset/Xt4/XtScreen/XtScreen
+	/Xt4/XtScreen/XtScreen
 	"VSW5TESTSUITE CASE XtWindow 1"
-	/tset/Xt4/XtWindow/XtWindow
+	/Xt4/XtWindow/XtWindow
 	"VSW5TESTSUITE CASE XtDisplayOfObject 2"
-	/tset/Xt4/XtDisplayOfObject/XtDisplayOfObject
+	/Xt4/XtDisplayOfObject/XtDisplayOfObject
 	"VSW5TESTSUITE CASE XtScreenOfObject 2"
-	/tset/Xt4/XtScreenOfObject/XtScreenOfObject
+	/Xt4/XtScreenOfObject/XtScreenOfObject
 	"VSW5TESTSUITE CASE XtWindowOfObject 2"
-	/tset/Xt4/XtWindowOfObject/XtWindowOfObject
+	/Xt4/XtWindowOfObject/XtWindowOfObject
 	"VSW5TESTSUITE CASE XtName 1"
-	/tset/Xt4/XtName/XtName
+	/Xt4/XtName/XtName
 	"VSW5TESTSUITE CASE XtUnrealizeWidget 4"
-	/tset/Xt4/XtUnrealizeWidget/XtUnrealizeWidget
+	/Xt4/XtUnrealizeWidget/XtUnrealizeWidget
 	"VSW5TESTSUITE CASE XtDestroyWidget 3"
-	/tset/Xt4/XtDestroyWidget/XtDestroyWidget
+	/Xt4/XtDestroyWidget/XtDestroyWidget
diff --git a/xts5/scenarios/Xt5_scen b/xts5/scenarios/Xt5_scen
index 7e371259..3adc41e1 100644
--- a/xts5/scenarios/Xt5_scen
+++ b/xts5/scenarios/Xt5_scen
@@ -59,22 +59,22 @@
 #
 
 	"VSW5TESTSUITE CASE XtManageChildren 7"
-	/tset/Xt5/XtManageChildren/XtManageChildren
+	/Xt5/XtManageChildren/XtManageChildren
 	"VSW5TESTSUITE CASE XtManageChild 6"
-	/tset/Xt5/XtManageChild/XtManageChild
+	/Xt5/XtManageChild/XtManageChild
 	"VSW5TESTSUITE CASE XtCreateManagedWidget 15"
-	/tset/Xt5/XtCreateManagedWidget/XtCreateManagedWidget
+	/Xt5/XtCreateManagedWidget/XtCreateManagedWidget
 	"VSW5TESTSUITE CASE XtVaCreateManagedWidget 19"
-	/tset/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget
+	/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget
 	"VSW5TESTSUITE CASE XtUnmanageChildren 8"
-	/tset/Xt5/XtUnmanageChildren/XtUnmanageChildren
+	/Xt5/XtUnmanageChildren/XtUnmanageChildren
 	"VSW5TESTSUITE CASE XtUnmanageChild 7"
-	/tset/Xt5/XtUnmanageChild/XtUnmanageChild
+	/Xt5/XtUnmanageChild/XtUnmanageChild
 	"VSW5TESTSUITE CASE XtIsManaged 3"
-	/tset/Xt5/XtIsManaged/XtIsManaged
+	/Xt5/XtIsManaged/XtIsManaged
 	"VSW5TESTSUITE CASE XtSetMappedWhenManaged 2"
-	/tset/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged
+	/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged
 	"VSW5TESTSUITE CASE XtMapWidget 1"
-	/tset/Xt5/XtMapWidget/XtMapWidget
+	/Xt5/XtMapWidget/XtMapWidget
 	"VSW5TESTSUITE CASE XtUnmapWidget 1"
-	/tset/Xt5/XtUnmapWidget/XtUnmapWidget
+	/Xt5/XtUnmapWidget/XtUnmapWidget
diff --git a/xts5/scenarios/Xt6_scen b/xts5/scenarios/Xt6_scen
index 6f75b11e..c7fcc315 100644
--- a/xts5/scenarios/Xt6_scen
+++ b/xts5/scenarios/Xt6_scen
@@ -59,16 +59,16 @@
 #
 
 	"VSW5TESTSUITE CASE ShellWidget 11"
-	/tset/Xt6/ShellWidget/ShellWidget
+	/Xt6/ShellWidget/ShellWidget
 	"VSW5TESTSUITE CASE OverrideShellWidget 10"
-	/tset/Xt6/OverrideShellWidget/OverrideShellWidget
+	/Xt6/OverrideShellWidget/OverrideShellWidget
 	"VSW5TESTSUITE CASE WMShellWidget 10"
-	/tset/Xt6/WMShellWidget/WMShellWidget
+	/Xt6/WMShellWidget/WMShellWidget
 	"VSW5TESTSUITE CASE VendorShellWidget 10"
-	/tset/Xt6/VendorShellWidget/VendorShellWidget
+	/Xt6/VendorShellWidget/VendorShellWidget
 	"VSW5TESTSUITE CASE TransientShellWidget 10"
-	/tset/Xt6/TransientShellWidget/TransientShellWidget
+	/Xt6/TransientShellWidget/TransientShellWidget
 	"VSW5TESTSUITE CASE TopLevelShellWidget 10"
-	/tset/Xt6/TopLevelShellWidget/TopLevelShellWidget
+	/Xt6/TopLevelShellWidget/TopLevelShellWidget
 	"VSW5TESTSUITE CASE ApplicationShellWidget 10"
-	/tset/Xt6/ApplicationShellWidget/ApplicationShellWidget
+	/Xt6/ApplicationShellWidget/ApplicationShellWidget
diff --git a/xts5/scenarios/Xt7_scen b/xts5/scenarios/Xt7_scen
index 6a211e15..77f1c26c 100644
--- a/xts5/scenarios/Xt7_scen
+++ b/xts5/scenarios/Xt7_scen
@@ -59,24 +59,24 @@
 #
 
 	"VSW5TESTSUITE CASE XtCreatePopupShell 6"
-	/tset/Xt7/XtCreatePopupShell/XtCreatePopupShell
+	/Xt7/XtCreatePopupShell/XtCreatePopupShell
 	"VSW5TESTSUITE CASE XtVaCreatePopupShell 6"
-	/tset/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell
+	/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell
 	"VSW5TESTSUITE CASE XtPopup 11"
-	/tset/Xt7/XtPopup/XtPopup
+	/Xt7/XtPopup/XtPopup
 	"VSW5TESTSUITE CASE XtPopdown 8"
-	/tset/Xt7/XtPopdown/XtPopdown
+	/Xt7/XtPopdown/XtPopdown
 	"VSW5TESTSUITE CASE XtPopupSpringLoaded 9"
-	/tset/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded
+	/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded
 	"VSW5TESTSUITE CASE XtCallbackNone 8"
-	/tset/Xt7/XtCallbackNone/XtCallbackNone
+	/Xt7/XtCallbackNone/XtCallbackNone
 	"VSW5TESTSUITE CASE XtCallbackNonexclusive 8"
-	/tset/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive
+	/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive
 	"VSW5TESTSUITE CASE XtCallbackExclusive 8"
-	/tset/Xt7/XtCallbackExclusive/XtCallbackExclusive
+	/Xt7/XtCallbackExclusive/XtCallbackExclusive
 	"VSW5TESTSUITE CASE XtMenuPopup 22"
-	/tset/Xt7/XtMenuPopup/XtMenuPopup
+	/Xt7/XtMenuPopup/XtMenuPopup
 	"VSW5TESTSUITE CASE XtCallbackPopdown 9"
-	/tset/Xt7/XtCallbackPopdown/XtCallbackPopdown
+	/Xt7/XtCallbackPopdown/XtCallbackPopdown
 	"VSW5TESTSUITE CASE XtMenuPopdown 11"
-	/tset/Xt7/XtMenuPopdown/XtMenuPopdown
+	/Xt7/XtMenuPopdown/XtMenuPopdown
diff --git a/xts5/scenarios/Xt8_scen b/xts5/scenarios/Xt8_scen
index d4e4c504..6bbb9182 100644
--- a/xts5/scenarios/Xt8_scen
+++ b/xts5/scenarios/Xt8_scen
@@ -59,16 +59,16 @@
 #
 
 	"VSW5TESTSUITE CASE XtMakeGeometryRequest 11"
-	/tset/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest
+	/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest
 	"VSW5TESTSUITE CASE XtMakeResizeRequest 12"
-	/tset/Xt8/XtMakeResizeRequest/XtMakeResizeRequest
+	/Xt8/XtMakeResizeRequest/XtMakeResizeRequest
 	"VSW5TESTSUITE CASE XtMoveWidget 3"
-	/tset/Xt8/XtMoveWidget/XtMoveWidget
+	/Xt8/XtMoveWidget/XtMoveWidget
 	"VSW5TESTSUITE CASE XtResizeWidget 4"
-	/tset/Xt8/XtResizeWidget/XtResizeWidget
+	/Xt8/XtResizeWidget/XtResizeWidget
 	"VSW5TESTSUITE CASE XtConfigureWidget 5"
-	/tset/Xt8/XtConfigureWidget/XtConfigureWidget
+	/Xt8/XtConfigureWidget/XtConfigureWidget
 	"VSW5TESTSUITE CASE XtResizeWindow 2"
-	/tset/Xt8/XtResizeWindow/XtResizeWindow
+	/Xt8/XtResizeWindow/XtResizeWindow
 	"VSW5TESTSUITE CASE XtQueryGeometry 6"
-	/tset/Xt8/XtQueryGeometry/XtQueryGeometry
+	/Xt8/XtQueryGeometry/XtQueryGeometry
diff --git a/xts5/scenarios/Xt9_scen b/xts5/scenarios/Xt9_scen
index 0b69f052..1ae0455d 100644
--- a/xts5/scenarios/Xt9_scen
+++ b/xts5/scenarios/Xt9_scen
@@ -59,68 +59,68 @@
 #
 
 	"VSW5TESTSUITE CASE XtAppAddInput 5"
-	/tset/Xt9/XtAppAddInput/XtAppAddInput
+	/Xt9/XtAppAddInput/XtAppAddInput
 	"VSW5TESTSUITE CASE XtRemoveInput 1"
-	/tset/Xt9/XtRemoveInput/XtRemoveInput
+	/Xt9/XtRemoveInput/XtRemoveInput
 	"VSW5TESTSUITE CASE XtAppAddTimeOut 3"
-	/tset/Xt9/XtAppAddTimeOut/XtAppAddTimeOut
+	/Xt9/XtAppAddTimeOut/XtAppAddTimeOut
 	"VSW5TESTSUITE CASE XtRemoveTimeOut 1"
-	/tset/Xt9/XtRemoveTimeOut/XtRemoveTimeOut
+	/Xt9/XtRemoveTimeOut/XtRemoveTimeOut
 	"VSW5TESTSUITE CASE XtAddGrab 5"
-	/tset/Xt9/XtAddGrab/XtAddGrab
+	/Xt9/XtAddGrab/XtAddGrab
 	"VSW5TESTSUITE CASE XtRemoveGrab 2"
-	/tset/Xt9/XtRemoveGrab/XtRemoveGrab
+	/Xt9/XtRemoveGrab/XtRemoveGrab
 	"VSW5TESTSUITE CASE XtGrabKey 5"
-	/tset/Xt9/XtGrabKey/XtGrabKey
+	/Xt9/XtGrabKey/XtGrabKey
 	"VSW5TESTSUITE CASE XtUngrabKey 2"
-	/tset/Xt9/XtUngrabKey/XtUngrabKey
+	/Xt9/XtUngrabKey/XtUngrabKey
 	"VSW5TESTSUITE CASE XtGrabKeyboard 2"
-	/tset/Xt9/XtGrabKeyboard/XtGrabKeyboard
+	/Xt9/XtGrabKeyboard/XtGrabKeyboard
 	"VSW5TESTSUITE CASE XtUngrabKeyboard 1"
-	/tset/Xt9/XtUngrabKeyboard/XtUngrabKeyboard
+	/Xt9/XtUngrabKeyboard/XtUngrabKeyboard
 	"VSW5TESTSUITE CASE XtGrabButton 5"
-	/tset/Xt9/XtGrabButton/XtGrabButton
+	/Xt9/XtGrabButton/XtGrabButton
 	"VSW5TESTSUITE CASE XtUngrabButton 2"
-	/tset/Xt9/XtGrabButton/XtGrabButton
+	/Xt9/XtGrabButton/XtGrabButton
 	"VSW5TESTSUITE CASE XtGrabPointer 2"
-	/tset/Xt9/XtGrabPointer/XtGrabPointer
+	/Xt9/XtGrabPointer/XtGrabPointer
 	"VSW5TESTSUITE CASE XtUngrabPointer 1"
-	/tset/Xt9/XtUngrabPointer/XtUngrabPointer
+	/Xt9/XtUngrabPointer/XtUngrabPointer
 	"VSW5TESTSUITE CASE XtSetKeyboardFocus 17"
-	/tset/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus
+	/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus
 	"VSW5TESTSUITE CASE XtCallAcceptFocus 2"
-	/tset/Xt9/XtCallAcceptFocus/XtCallAcceptFocus
+	/Xt9/XtCallAcceptFocus/XtCallAcceptFocus
 	"VSW5TESTSUITE CASE XtAppPending 5"
-	/tset/Xt9/XtAppPending/XtAppPending
+	/Xt9/XtAppPending/XtAppPending
 	"VSW5TESTSUITE CASE XtAppPeekEvent 3"
-	/tset/Xt9/XtAppPeekEvent/XtAppPeekEvent
+	/Xt9/XtAppPeekEvent/XtAppPeekEvent
 	"VSW5TESTSUITE CASE XtAppNextEvent 4"
-	/tset/Xt9/XtAppNextEvent/XtAppNextEvent
+	/Xt9/XtAppNextEvent/XtAppNextEvent
 	"VSW5TESTSUITE CASE XtAppProcessEvent 11"
-	/tset/Xt9/XtAppProcessEvent/XtAppProcessEvent
+	/Xt9/XtAppProcessEvent/XtAppProcessEvent
 	"VSW5TESTSUITE CASE XtDispatchEvent 11"
-	/tset/Xt9/XtDispatchEvent/XtDispatchEvent
+	/Xt9/XtDispatchEvent/XtDispatchEvent
 	"VSW5TESTSUITE CASE XtAppMainLoop 28"
-	/tset/Xt9/XtAppMainLoop/XtAppMainLoop
+	/Xt9/XtAppMainLoop/XtAppMainLoop
 	"VSW5TESTSUITE CASE XtIsSensitive 4"
-	/tset/Xt9/XtIsSensitive/XtIsSensitive
+	/Xt9/XtIsSensitive/XtIsSensitive
 	"VSW5TESTSUITE CASE XtSetSensitive 6"
-	/tset/Xt9/XtSetSensitive/XtSetSensitive
+	/Xt9/XtSetSensitive/XtSetSensitive
 	"VSW5TESTSUITE CASE XtAppAddWorkProc 5"
-	/tset/Xt9/XtAppAddWorkProc/XtAppAddWorkProc
+	/Xt9/XtAppAddWorkProc/XtAppAddWorkProc
 	"VSW5TESTSUITE CASE XtRemoveWorkProc 2"
-	/tset/Xt9/XtRemoveWorkProc/XtRemoveWorkProc
+	/Xt9/XtRemoveWorkProc/XtRemoveWorkProc
 	"VSW5TESTSUITE CASE XtAddEventHandler 8"
-	/tset/Xt9/XtAddEventHandler/XtAddEventHandler
+	/Xt9/XtAddEventHandler/XtAddEventHandler
 	"VSW5TESTSUITE CASE XtRemoveEventHandler 7"
-	/tset/Xt9/XtRemoveEventHandler/XtRemoveEventHandler
+	/Xt9/XtRemoveEventHandler/XtRemoveEventHandler
 	"VSW5TESTSUITE CASE XtInsertEventHandler 10"
-	/tset/Xt9/XtInsertEventHandler/XtInsertEventHandler
+	/Xt9/XtInsertEventHandler/XtInsertEventHandler
 	"VSW5TESTSUITE CASE XtAddRawEventHandler 9"
-	/tset/Xt9/XtAddRawEventHandler/XtAddRawEventHandler
+	/Xt9/XtAddRawEventHandler/XtAddRawEventHandler
 	"VSW5TESTSUITE CASE XtRemoveRawEventHandler 7"
-	/tset/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler
+	/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler
 	"VSW5TESTSUITE CASE XtInsertRawEventHandler 10"
-	/tset/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler
+	/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler
 	"VSW5TESTSUITE CASE XtBuildEventMask 3"
-	/tset/Xt9/XtBuildEventMask/XtBuildEventMask
+	/Xt9/XtBuildEventMask/XtBuildEventMask
diff --git a/xts5/scenarios/XtC_scen b/xts5/scenarios/XtC_scen
index 23c7f456..c9a861cd 100644
--- a/xts5/scenarios/XtC_scen
+++ b/xts5/scenarios/XtC_scen
@@ -59,60 +59,60 @@
 #
 
 	"VSW5TESTSUITE CASE XtGetErrorDatabase 1"
-	/tset/XtC/XtGetErrorDatabase/XtGetErrorDatabase
+	/XtC/XtGetErrorDatabase/XtGetErrorDatabase
 	"VSW5TESTSUITE CASE XtGetErrorDatabaseText 2"
-	/tset/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText
+	/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText
 	"VSW5TESTSUITE CASE XtInitialize 27"
-	/tset/XtC/XtInitialize/XtInitialize
+	/XtC/XtInitialize/XtInitialize
 	"VSW5TESTSUITE CASE XtMainLoop 28"
-	/tset/XtC/XtMainLoop/XtMainLoop
+	/XtC/XtMainLoop/XtMainLoop
 	"VSW5TESTSUITE CASE XtNextEvent 4"
-	/tset/XtC/XtNextEvent/XtNextEvent
+	/XtC/XtNextEvent/XtNextEvent
 	"VSW5TESTSUITE CASE XtProcessEvent 12"
-	/tset/XtC/XtProcessEvent/XtProcessEvent
+	/XtC/XtProcessEvent/XtProcessEvent
 	"VSW5TESTSUITE CASE XtPeekEvent 3"
-	/tset/XtC/XtPeekEvent/XtPeekEvent
+	/XtC/XtPeekEvent/XtPeekEvent
 	"VSW5TESTSUITE CASE XtPending 2"
-	/tset/XtC/XtPending/XtPending
+	/XtC/XtPending/XtPending
 	"VSW5TESTSUITE CASE XtAddInput 5"
-	/tset/XtC/XtAddInput/XtAddInput
+	/XtC/XtAddInput/XtAddInput
 	"VSW5TESTSUITE CASE XtAddTimeOut 2"
-	/tset/XtC/XtAddTimeOut/XtAddTimeOut
+	/XtC/XtAddTimeOut/XtAddTimeOut
 	"VSW5TESTSUITE CASE XtAddWorkProc 5"
-	/tset/XtC/XtAddWorkProc/XtAddWorkProc
+	/XtC/XtAddWorkProc/XtAddWorkProc
 	"VSW5TESTSUITE CASE XtCreateApplicationShell 7"
-	/tset/XtC/XtCreateApplicationShell/XtCreateApplicationShell
+	/XtC/XtCreateApplicationShell/XtCreateApplicationShell
 	"VSW5TESTSUITE CASE XtStringConversionWarning 1"
-	/tset/XtC/XtStringConversionWarning/XtStringConversionWarning
+	/XtC/XtStringConversionWarning/XtStringConversionWarning
 	"VSW5TESTSUITE CASE XtAddConverter 10"
-	/tset/XtC/XtAddConverter/XtAddConverter
+	/XtC/XtAddConverter/XtAddConverter
 	"VSW5TESTSUITE CASE XtAppAddConverter 10"
-	/tset/XtC/XtAppAddConverter/XtAppAddConverter
+	/XtC/XtAppAddConverter/XtAppAddConverter
 	"VSW5TESTSUITE CASE XtConvert 1"
-	/tset/XtC/XtConvert/XtConvert
+	/XtC/XtConvert/XtConvert
 	"VSW5TESTSUITE CASE XtDirectConvert 3"
-	/tset/XtC/XtDirectConvert/XtDirectConvert
+	/XtC/XtDirectConvert/XtDirectConvert
 	"VSW5TESTSUITE CASE XtDestroyGC 2"
-	/tset/XtC/XtDestroyGC/XtDestroyGC
+	/XtC/XtDestroyGC/XtDestroyGC
 	"VSW5TESTSUITE CASE XtAddActions 3"
-	/tset/XtC/XtAddActions/XtAddActions
+	/XtC/XtAddActions/XtAddActions
 	"VSW5TESTSUITE CASE XtSetSelectionTimeout 1"
-	/tset/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout
+	/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout
 	"VSW5TESTSUITE CASE XtGetSelectionTimeout 2"
-	/tset/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout
+	/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout
 	"VSW5TESTSUITE CASE XtSetErrorMsgHandler 1"
-	/tset/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler
+	/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler
 	"VSW5TESTSUITE CASE XtErrorMsg 3"
-	/tset/XtC/XtErrorMsg/XtErrorMsg
+	/XtC/XtErrorMsg/XtErrorMsg
 	"VSW5TESTSUITE CASE XtSetWarningHandler 1"
-	/tset/XtC/XtSetWarningHandler/XtSetWarningHandler
+	/XtC/XtSetWarningHandler/XtSetWarningHandler
 	"VSW5TESTSUITE CASE XtSetWarningMsgHandler 1"
-	/tset/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler
+	/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler
 	"VSW5TESTSUITE CASE XtWarning 3"
-	/tset/XtC/XtWarning/XtWarning
+	/XtC/XtWarning/XtWarning
 	"VSW5TESTSUITE CASE XtWarningMsg 3"
-	/tset/XtC/XtWarningMsg/XtWarningMsg
+	/XtC/XtWarningMsg/XtWarningMsg
 	"VSW5TESTSUITE CASE XtSetErrorHandler 1"
-	/tset/XtC/XtSetErrorHandler/XtSetErrorHandler
+	/XtC/XtSetErrorHandler/XtSetErrorHandler
 	"VSW5TESTSUITE CASE XtError 3"
-	/tset/XtC/XtError/XtError
+	/XtC/XtError/XtError
diff --git a/xts5/scenarios/XtE_scen b/xts5/scenarios/XtE_scen
index 77f32ba1..64e75928 100644
--- a/xts5/scenarios/XtE_scen
+++ b/xts5/scenarios/XtE_scen
@@ -59,4 +59,4 @@
 #
 
 	"VSW5TESTSUITE CASE StringDefs.h 1"
-	/tset/XtE/StringDefs.h/StringDefs.h
+	/XtE/StringDefs.h/StringDefs.h
diff --git a/xts5/scenarios/shape_scen b/xts5/scenarios/shape_scen
index fec747f8..3a33c125 100644
--- a/xts5/scenarios/shape_scen
+++ b/xts5/scenarios/shape_scen
@@ -62,24 +62,24 @@
 #
 
 	"VSW5TESTSUITE CASE XShapeOffsetShape 1"
-	/tset/SHAPE/XShapeOffsetShape/XShapeOffsetShape
+	/SHAPE/XShapeOffsetShape/XShapeOffsetShape
 	"VSW5TESTSUITE CASE XShapeCombineMask 1"
-	/tset/SHAPE/XShapeCombineMask/XShapeCombineMask
+	/SHAPE/XShapeCombineMask/XShapeCombineMask
 	"VSW5TESTSUITE CASE XShapeCombineRectangles 1"
-	/tset/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles
+	/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles
 	"VSW5TESTSUITE CASE XShapeCombineRegion 1"
-	/tset/SHAPE/XShapeCombineRegion/XShapeCombineRegion
+	/SHAPE/XShapeCombineRegion/XShapeCombineRegion
 	"VSW5TESTSUITE CASE XShapeCombineShape 1"
-	/tset/SHAPE/XShapeCombineShape/XShapeCombineShape
+	/SHAPE/XShapeCombineShape/XShapeCombineShape
 	"VSW5TESTSUITE CASE XShapeGetRectangles 1"
-	/tset/SHAPE/XShapeGetRectangles/XShapeGetRectangles
+	/SHAPE/XShapeGetRectangles/XShapeGetRectangles
 	"VSW5TESTSUITE CASE XShapeInputSelected 1"
-	/tset/SHAPE/XShapeInputSelected/XShapeInputSelected
+	/SHAPE/XShapeInputSelected/XShapeInputSelected
 	"VSW5TESTSUITE CASE XShapeQueryExtension 1"
-	/tset/SHAPE/XShapeQueryExtension/XShapeQueryExtension
+	/SHAPE/XShapeQueryExtension/XShapeQueryExtension
 	"VSW5TESTSUITE CASE XShapeQueryExtents 1"
-	/tset/SHAPE/XShapeQueryExtents/XShapeQueryExtents
+	/SHAPE/XShapeQueryExtents/XShapeQueryExtents
 	"VSW5TESTSUITE CASE XShapeQueryVersion 1"
-	/tset/SHAPE/XShapeQueryVersion/XShapeQueryVersion
+	/SHAPE/XShapeQueryVersion/XShapeQueryVersion
 	"VSW5TESTSUITE CASE XShapeSelectInput 1"
-	/tset/SHAPE/XShapeSelectInput/XShapeSelectInput
+	/SHAPE/XShapeSelectInput/XShapeSelectInput
diff --git a/xts5/tet_scen b/xts5/tet_scen
index e605b00a..46c10c92 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -502,4251 +502,4251 @@ ShapeExt
 
 XAllowDeviceEvents
 	"VSW5TESTSUITE CASE XAllowDeviceEvents 22"
-	/tset/XI/AllowDeviceEvents/AllowDeviceEvents
+	/XI/AllowDeviceEvents/AllowDeviceEvents
 
 XChangeDeviceControl
 	"VSW5TESTSUITE CASE XChangeDeviceControl 10"
-	/tset/XI/ChangeDeviceControl/ChangeDeviceControl
+	/XI/ChangeDeviceControl/ChangeDeviceControl
 
 XChangeFeedbackControl
 	"VSW5TESTSUITE CASE XChangeFeedbackControl 8"
-	/tset/XI/ChangeFeedbackControl/ChangeFeedbackControl
+	/XI/ChangeFeedbackControl/ChangeFeedbackControl
 
 XChangeKeyboardDevice
 	"VSW5TESTSUITE CASE XChangeKeyboardDevice 10"
-	/tset/XI/ChangeKeyboardDevice/ChangeKeyboardDevice
+	/XI/ChangeKeyboardDevice/ChangeKeyboardDevice
 
 XChangeDeviceDontPropagateList
 	"VSW5TESTSUITE CASE XChangeDeviceDontPropagateList 7"
-	/tset/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList
+	/XI/XChangeDeviceDontPropagateList/XChangeDeviceDontPropagateList
 
 XChangePointerDevice
 	"VSW5TESTSUITE CASE XChangePointerDevice 10"
-	/tset/XI/ChangePointerDevice/ChangePointerDevice
+	/XI/ChangePointerDevice/ChangePointerDevice
 
 XChangeDeviceKeyMapping
 	"VSW5TESTSUITE CASE XChangeDeviceKeyMapping 7"
-	/tset/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping
+	/XI/ChangeDeviceKeyMapping/ChangeDeviceKeyMapping
 
 XCloseDevice
 	"VSW5TESTSUITE CASE XCloseDevice 7"
-	/tset/XI/CloseDevice/CloseDevice
+	/XI/CloseDevice/CloseDevice
 
 XDeviceBell
 	"VSW5TESTSUITE CASE XDeviceBell 6"
-	/tset/XI/DeviceBell/DeviceBell
+	/XI/DeviceBell/DeviceBell
 
 XGetDeviceControl
 	"VSW5TESTSUITE CASE XGetDeviceControl 4"
-	/tset/XI/XGetDeviceControl/XGetDeviceControl
+	/XI/XGetDeviceControl/XGetDeviceControl
 
 XGetFeedbackControl
 	"VSW5TESTSUITE CASE XGetFeedbackControl 3"
-	/tset/XI/GetFeedbackControl/GetFeedbackControl
+	/XI/GetFeedbackControl/GetFeedbackControl
 
 XGetDeviceFocus
 	"VSW5TESTSUITE CASE XGetDeviceFocus 2"
-	/tset/XI/XGetDeviceFocus/XGetDeviceFocus
+	/XI/XGetDeviceFocus/XGetDeviceFocus
 
 XGetDeviceDontPropagateList
 	"VSW5TESTSUITE CASE XGetDeviceDontPropagateList 2"
-	/tset/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList
+	/XI/XGetDeviceDontPropagateList/XGetDeviceDontPropagateList
 
 XGetExtensionVersion
 	"VSW5TESTSUITE CASE XGetExtensionVersion 2"
-	/tset/XI/GetExtensionVersion/GetExtensionVersion
+	/XI/GetExtensionVersion/GetExtensionVersion
 
 XGrabDevice
 	"VSW5TESTSUITE CASE XGrabDevice 18"
-	/tset/XI/GrabDevice/GrabDevice
+	/XI/GrabDevice/GrabDevice
 
 XGrabDeviceButton
 	"VSW5TESTSUITE CASE XGrabDeviceButton 21"
-	/tset/XI/GrabDeviceButton/GrabDeviceButton
+	/XI/GrabDeviceButton/GrabDeviceButton
 
 XGrabDeviceKey
 	"VSW5TESTSUITE CASE XGrabDeviceKey 21"
-	/tset/XI/GrabDeviceKey/GrabDeviceKey
+	/XI/GrabDeviceKey/GrabDeviceKey
 
 XGetDeviceButtonMapping
 	"VSW5TESTSUITE CASE XGetDeviceButtonMapping 5"
-	/tset/XI/GetDeviceButtonMapping/GetDeviceButtonMapping
+	/XI/GetDeviceButtonMapping/GetDeviceButtonMapping
 
 XGetDeviceKeyMapping
 	"VSW5TESTSUITE CASE XGetDeviceKeyMapping 10"
-	/tset/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping
+	/XI/XGetDeviceKeyMapping/XGetDeviceKeyMapping
 
 XGetDeviceModifierMapping
 	"VSW5TESTSUITE CASE XGetDeviceModifierMapping 4"
-	/tset/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping
+	/XI/XGetDeviceModifierMapping/XGetDeviceModifierMapping
 
 XGetDeviceMotionEvents
 	"VSW5TESTSUITE CASE XGetDeviceMotionEvents 9"
-	/tset/XI/GetDeviceMotionEvents/GetDeviceMotionEvents
+	/XI/GetDeviceMotionEvents/GetDeviceMotionEvents
 
 XGetSelectedExtensionEvents
 	"VSW5TESTSUITE CASE XGetSelectedExtensionEvents 2"
-	/tset/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents
+	/XI/XGetSelectedExtensionEvents/XGetSelectedExtensionEvents
 
 XListInputDevices
 	"VSW5TESTSUITE CASE XListInputDevices 2"
-	/tset/XI/ListInputDevices/ListInputDevices
+	/XI/ListInputDevices/ListInputDevices
 
 Miscellaneous
 	"VSW5TESTSUITE CASE Miscellaneous 6"
-	/tset/XI/Miscellaneous/Miscellaneous
+	/XI/Miscellaneous/Miscellaneous
 
 XOpenDevice
 	"VSW5TESTSUITE CASE XOpenDevice 4"
-	/tset/XI/OpenDevice/OpenDevice
+	/XI/OpenDevice/OpenDevice
 
 XQueryDeviceState
 	"VSW5TESTSUITE CASE XQueryDeviceState 8"
-	/tset/XI/XQueryDeviceState/XQueryDeviceState
+	/XI/XQueryDeviceState/XQueryDeviceState
 
 XSetDeviceValuators
 	"VSW5TESTSUITE CASE XSetDeviceValuators 6"
-	/tset/XI/SetDeviceValuators/SetDeviceValuators
+	/XI/SetDeviceValuators/SetDeviceValuators
 
 XSetDeviceButtonMapping
 	"VSW5TESTSUITE CASE XSetDeviceButtonMapping 8"
-	/tset/XI/SetDeviceButtonMapping/SetDeviceButtonMapping
+	/XI/SetDeviceButtonMapping/SetDeviceButtonMapping
 
 XSetDeviceFocus
 	"VSW5TESTSUITE CASE XSetDeviceFocus 17"
-	/tset/XI/XSetDeviceFocus/XSetDeviceFocus
+	/XI/XSetDeviceFocus/XSetDeviceFocus
 
 XSetDeviceModifierMapping
 	"VSW5TESTSUITE CASE XSetDeviceModifierMapping 9"
-	/tset/XI/SetDeviceModifierMapping/SetDeviceModifierMapping
+	/XI/SetDeviceModifierMapping/SetDeviceModifierMapping
 
 XSetDeviceMode
 	"VSW5TESTSUITE CASE XSetDeviceMode 6"
-	/tset/XI/SetDeviceMode/SetDeviceMode
+	/XI/SetDeviceMode/SetDeviceMode
 
 XSelectExtensionEvent
 	"VSW5TESTSUITE CASE XSelectExtensionEvent 13"
-	/tset/XI/XSelectExtensionEvent/XSelectExtensionEvent
+	/XI/XSelectExtensionEvent/XSelectExtensionEvent
 
 XSendExtensionEvent
 	"VSW5TESTSUITE CASE XSendExtensionEvent 20"
-	/tset/XI/SendExtensionEvent/SendExtensionEvent
+	/XI/SendExtensionEvent/SendExtensionEvent
 
 XUngrabDevice
 	"VSW5TESTSUITE CASE XUngrabDevice 4"
-	/tset/XI/XUngrabDevice/XUngrabDevice
+	/XI/XUngrabDevice/XUngrabDevice
 
 XUngrabDeviceButton
 	"VSW5TESTSUITE CASE XUngrabDeviceButton 11"
-	/tset/XI/UngrabDeviceButton/UngrabDeviceButton
+	/XI/UngrabDeviceButton/UngrabDeviceButton
 
 XUngrabDeviceKey
 	"VSW5TESTSUITE CASE XUngrabDeviceKey 12"
-	/tset/XI/UngrabDeviceKey/UngrabDeviceKey
+	/XI/UngrabDeviceKey/UngrabDeviceKey
 
 # Discrete tests for Shape Extension Tests
 
 XShapeOffsetShape
 	"VSW5TESTSUITE CASE XShapeOffsetShape 1"
-	/tset/SHAPE/XShapeOffsetShape/XShapeOffsetShape
+	/SHAPE/XShapeOffsetShape/XShapeOffsetShape
 
 XShapeCombineMask
 	"VSW5TESTSUITE CASE XShapeCombineMask 1"
-	/tset/SHAPE/XShapeCombineMask/XShapeCombineMask
+	/SHAPE/XShapeCombineMask/XShapeCombineMask
 
 XShapeCombineRectangles
 	"VSW5TESTSUITE CASE XShapeCombineRectangles 1"
-	/tset/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles
+	/SHAPE/XShapeCombineRectangles/XShapeCombineRectangles
 
 XShapeCombineRegion
 	"VSW5TESTSUITE CASE XShapeCombineRegion 1"
-	/tset/SHAPE/XShapeCombineRegion/XShapeCombineRegion
+	/SHAPE/XShapeCombineRegion/XShapeCombineRegion
 
 XShapeCombineShape
 	"VSW5TESTSUITE CASE XShapeCombineShape 1"
-	/tset/SHAPE/XShapeCombineShape/XShapeCombineShape
+	/SHAPE/XShapeCombineShape/XShapeCombineShape
 
 XShapeGetRectangles
 	"VSW5TESTSUITE CASE XShapeGetRectangles 1"
-	/tset/SHAPE/XShapeGetRectangles/XShapeGetRectangles
+	/SHAPE/XShapeGetRectangles/XShapeGetRectangles
 
 XShapeInputSelected
 	"VSW5TESTSUITE CASE XShapeInputSelected 1"
-	/tset/SHAPE/XShapeInputSelected/XShapeInputSelected
+	/SHAPE/XShapeInputSelected/XShapeInputSelected
 
 XShapeQueryExtension
 	"VSW5TESTSUITE CASE XShapeQueryExtension 1"
-	/tset/SHAPE/XShapeQueryExtension/XShapeQueryExtension
+	/SHAPE/XShapeQueryExtension/XShapeQueryExtension
 
 XShapeQueryExtents
 	"VSW5TESTSUITE CASE XShapeQueryExtents 1"
-	/tset/SHAPE/XShapeQueryExtents/XShapeQueryExtents
+	/SHAPE/XShapeQueryExtents/XShapeQueryExtents
 
 XShapeQueryVersion
 	"VSW5TESTSUITE CASE XShapeQueryVersion 1"
-	/tset/SHAPE/XShapeQueryVersion/XShapeQueryVersion
+	/SHAPE/XShapeQueryVersion/XShapeQueryVersion
 
 XShapeSelectInput
 	"VSW5TESTSUITE CASE XShapeSelectInput 1"
-	/tset/SHAPE/XShapeSelectInput/XShapeSelectInput
+	/SHAPE/XShapeSelectInput/XShapeSelectInput
 
 # Discrete tests for Xlib Chapter 10-Window and Session Manager Functions
 
 XActivateScreenSaver
 	"VSW5TESTSUITE CASE XActivateScreenSaver 2"
-	/tset/Xlib10/XActivateScreenSaver/XActivateScreenSaver
+	/Xlib10/XActivateScreenSaver/XActivateScreenSaver
 
 XAddHost
 	"VSW5TESTSUITE CASE XAddHost 3"
-	/tset/Xlib10/XAddHost/XAddHost
+	/Xlib10/XAddHost/XAddHost
 
 XAddHosts
 	"VSW5TESTSUITE CASE XAddHosts 3"
-	/tset/Xlib10/XAddHosts/XAddHosts
+	/Xlib10/XAddHosts/XAddHosts
 
 XAddToSaveSet
 	"VSW5TESTSUITE CASE XAddToSaveSet 8"
-	/tset/Xlib10/XAddToSaveSet/XAddToSaveSet
+	/Xlib10/XAddToSaveSet/XAddToSaveSet
 
 XChangeSaveSet
 	"VSW5TESTSUITE CASE XChangeSaveSet 5"
-	/tset/Xlib10/XChangeSaveSet/XChangeSaveSet
+	/Xlib10/XChangeSaveSet/XChangeSaveSet
 
 XDisableAccessControl
 	"VSW5TESTSUITE CASE XDisableAccessControl 2"
-	/tset/Xlib10/XDisableAccessControl/XDisableAccessControl
+	/Xlib10/XDisableAccessControl/XDisableAccessControl
 
 XEnableAccessControl
 	"VSW5TESTSUITE CASE XEnableAccessControl 2"
-	/tset/Xlib10/XEnableAccessControl/XEnableAccessControl
+	/Xlib10/XEnableAccessControl/XEnableAccessControl
 
 XForceScreenSaver
 	"VSW5TESTSUITE CASE XForceScreenSaver 3"
-	/tset/Xlib10/XForceScreenSaver/XForceScreenSaver
+	/Xlib10/XForceScreenSaver/XForceScreenSaver
 
 XGrabServer
 	"VSW5TESTSUITE CASE XGrabServer 1"
-	/tset/Xlib10/XGrabServer/XGrabServer
+	/Xlib10/XGrabServer/XGrabServer
 
 XGetScreenSaver
 	"VSW5TESTSUITE CASE XGetScreenSaver 1"
-	/tset/Xlib10/XGetScreenSaver/XGetScreenSaver
+	/Xlib10/XGetScreenSaver/XGetScreenSaver
 
 XInstallColormap
 	"VSW5TESTSUITE CASE XInstallColormap 6"
-	/tset/Xlib10/XInstallColormap/XInstallColormap
+	/Xlib10/XInstallColormap/XInstallColormap
 
 XKillClient
 	"VSW5TESTSUITE CASE XKillClient 4"
-	/tset/Xlib10/XKillClient/XKillClient
+	/Xlib10/XKillClient/XKillClient
 
 XListHosts
 	"VSW5TESTSUITE CASE XListHosts 2"
-	/tset/Xlib10/XListHosts/XListHosts
+	/Xlib10/XListHosts/XListHosts
 
 XListInstalledColormaps
 	"VSW5TESTSUITE CASE XListInstalledColormaps 2"
-	/tset/Xlib10/XListInstalledColormaps/XListInstalledColormaps
+	/Xlib10/XListInstalledColormaps/XListInstalledColormaps
 
 XRemoveFromSaveSet
 	"VSW5TESTSUITE CASE XRemoveFromSaveSet 3"
-	/tset/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet
+	/Xlib10/XRemoveFromSaveSet/XRemoveFromSaveSet
 
 XRemoveHost
 	"VSW5TESTSUITE CASE XRemoveHost 3"
-	/tset/Xlib10/XRemoveHost/XRemoveHost
+	/Xlib10/XRemoveHost/XRemoveHost
 
 XRemoveHosts
 	"VSW5TESTSUITE CASE XRemoveHosts 3"
-	/tset/Xlib10/XRemoveHosts/XRemoveHosts
+	/Xlib10/XRemoveHosts/XRemoveHosts
 
 XReparentWindow
 	"VSW5TESTSUITE CASE XReparentWindow 13"
-	/tset/Xlib10/XReparentWindow/XReparentWindow
+	/Xlib10/XReparentWindow/XReparentWindow
 
 XResetScreenSaver
 	"VSW5TESTSUITE CASE XResetScreenSaver 2"
-	/tset/Xlib10/XResetScreenSaver/XResetScreenSaver
+	/Xlib10/XResetScreenSaver/XResetScreenSaver
 
 XSetAccessControl
 	"VSW5TESTSUITE CASE XSetAccessControl 4"
-	/tset/Xlib10/XSetAccessControl/XSetAccessControl
+	/Xlib10/XSetAccessControl/XSetAccessControl
 
 XSetScreenSaver
 	"VSW5TESTSUITE CASE XSetScreenSaver 17"
-	/tset/Xlib10/XSetScreenSaver/XSetScreenSaver
+	/Xlib10/XSetScreenSaver/XSetScreenSaver
 
 XUngrabServer
 	"VSW5TESTSUITE CASE XUngrabServer 1"
-	/tset/Xlib10/XUngrabServer/XUngrabServer
+	/Xlib10/XUngrabServer/XUngrabServer
 
 XUninstallColormap
 	"VSW5TESTSUITE CASE XUninstallColormap 5"
-	/tset/Xlib10/XUninstallColormap/XUninstallColormap
+	/Xlib10/XUninstallColormap/XUninstallColormap
 
 # Discrete tests for Xlib Chapter 11-Events
 
 ButtonPress
 	"VSW5TESTSUITE CASE ButtonPress 12"
-	/tset/Xlib11/ButtonPress/ButtonPress
+	/Xlib11/ButtonPress/ButtonPress
 
 ButtonRelease
 	"VSW5TESTSUITE CASE ButtonRelease 9"
-	/tset/Xlib11/ButtonRelease/ButtonRelease
+	/Xlib11/ButtonRelease/ButtonRelease
 
 ClientMessage
 	"VSW5TESTSUITE CASE ClientMessage 1"
-	/tset/Xlib11/ClientMessage/ClientMessage
+	/Xlib11/ClientMessage/ClientMessage
 
 ColormapNotify
 	"VSW5TESTSUITE CASE ColormapNotify 2"
-	/tset/Xlib11/ColormapNotify/ColormapNotify
+	/Xlib11/ColormapNotify/ColormapNotify
 
 ConfigureNotify
 	"VSW5TESTSUITE CASE ConfigureNotify 3"
-	/tset/Xlib11/ConfigureNotify/ConfigureNotify
+	/Xlib11/ConfigureNotify/ConfigureNotify
 
 ConfigureRequest
 	"VSW5TESTSUITE CASE ConfigureRequest 7"
-	/tset/Xlib11/ConfigureRequest/ConfigureRequest
+	/Xlib11/ConfigureRequest/ConfigureRequest
 
 CirculateNotify
 	"VSW5TESTSUITE CASE CirculateNotify 3"
-	/tset/Xlib11/CirculateNotify/CirculateNotify
+	/Xlib11/CirculateNotify/CirculateNotify
 
 CirculateRequest
 	"VSW5TESTSUITE CASE CirculateRequest 2"
-	/tset/Xlib11/CirculateRequest/CirculateRequest
+	/Xlib11/CirculateRequest/CirculateRequest
 
 CreateNotify
 	"VSW5TESTSUITE CASE CreateNotify 2"
-	/tset/Xlib11/CreateNotify/CreateNotify
+	/Xlib11/CreateNotify/CreateNotify
 
 DestroyNotify
 	"VSW5TESTSUITE CASE DestroyNotify 3"
-	/tset/Xlib11/DestroyNotify/DestroyNotify
+	/Xlib11/DestroyNotify/DestroyNotify
 
 EnterNotify
 	"VSW5TESTSUITE CASE EnterNotify 13"
-	/tset/Xlib11/EnterNotify/EnterNotify
+	/Xlib11/EnterNotify/EnterNotify
 
 Expose
 	"VSW5TESTSUITE CASE Expose 7"
-	/tset/Xlib11/Expose/Expose
+	/Xlib11/Expose/Expose
 
 FocusIn
 	"VSW5TESTSUITE CASE FocusIn 21"
-	/tset/Xlib11/FocusIn/FocusIn
+	/Xlib11/FocusIn/FocusIn
 
 FocusOut
 	"VSW5TESTSUITE CASE FocusOut 19"
-	/tset/Xlib11/FocusOut/FocusOut
+	/Xlib11/FocusOut/FocusOut
 
 GraphicsExpose
 	"VSW5TESTSUITE CASE GraphicsExpose 1"
-	/tset/Xlib11/GraphicsExpose/GraphicsExpose
+	/Xlib11/GraphicsExpose/GraphicsExpose
 
 GravityNotify
 	"VSW5TESTSUITE CASE GravityNotify 3"
-	/tset/Xlib11/GravityNotify/GravityNotify
+	/Xlib11/GravityNotify/GravityNotify
 
 KeymapNotify
 	"VSW5TESTSUITE CASE KeymapNotify 4"
-	/tset/Xlib11/KeymapNotify/KeymapNotify
+	/Xlib11/KeymapNotify/KeymapNotify
 
 KeyPress
 	"VSW5TESTSUITE CASE KeyPress 9"
-	/tset/Xlib11/KeyPress/KeyPress
+	/Xlib11/KeyPress/KeyPress
 
 KeyRelease
 	"VSW5TESTSUITE CASE KeyRelease 9"
-	/tset/Xlib11/KeyRelease/KeyRelease
+	/Xlib11/KeyRelease/KeyRelease
 
 LeaveNotify
 	"VSW5TESTSUITE CASE LeaveNotify 15"
-	/tset/Xlib11/LeaveNotify/LeaveNotify
+	/Xlib11/LeaveNotify/LeaveNotify
 
 MapNotify
 	"VSW5TESTSUITE CASE MapNotify 4"
-	/tset/Xlib11/MapNotify/MapNotify
+	/Xlib11/MapNotify/MapNotify
 
 MappingNotify
 	"VSW5TESTSUITE CASE MappingNotify 1"
-	/tset/Xlib11/MappingNotify/MappingNotify
+	/Xlib11/MappingNotify/MappingNotify
 
 MapRequest
 	"VSW5TESTSUITE CASE MapRequest 2"
-	/tset/Xlib11/MapRequest/MapRequest
+	/Xlib11/MapRequest/MapRequest
 
 MotionNotify
 	"VSW5TESTSUITE CASE MotionNotify 19"
-	/tset/Xlib11/MotionNotify/MotionNotify
+	/Xlib11/MotionNotify/MotionNotify
 
 NoExpose
 	"VSW5TESTSUITE CASE NoExpose 1"
-	/tset/Xlib11/NoExpose/NoExpose
+	/Xlib11/NoExpose/NoExpose
 
 PropertyNotify
 	"VSW5TESTSUITE CASE PropertyNotify 2"
-	/tset/Xlib11/PropertyNotify/PropertyNotify
+	/Xlib11/PropertyNotify/PropertyNotify
 
 ReparentNotify
 	"VSW5TESTSUITE CASE ReparentNotify 4"
-	/tset/Xlib11/ReparentNotify/ReparentNotify
+	/Xlib11/ReparentNotify/ReparentNotify
 
 ResizeRequest
 	"VSW5TESTSUITE CASE ResizeRequest 2"
-	/tset/Xlib11/ResizeRequest/ResizeRequest
+	/Xlib11/ResizeRequest/ResizeRequest
 
 SelectionClear
 	"VSW5TESTSUITE CASE SelectionClear 1"
-	/tset/Xlib11/SelectionClear/SelectionClear
+	/Xlib11/SelectionClear/SelectionClear
 
 SelectionNotify
 	"VSW5TESTSUITE CASE SelectionNotify 1"
-	/tset/Xlib11/SelectionNotify/SelectionNotify
+	/Xlib11/SelectionNotify/SelectionNotify
 
 SelectionRequest
 	"VSW5TESTSUITE CASE SelectionRequest 1"
-	/tset/Xlib11/SelectionRequest/SelectionRequest
+	/Xlib11/SelectionRequest/SelectionRequest
 
 UnmapNotify
 	"VSW5TESTSUITE CASE UnmapNotify 3"
-	/tset/Xlib11/UnmapNotify/UnmapNotify
+	/Xlib11/UnmapNotify/UnmapNotify
 
 VisibilityNotify
 	"VSW5TESTSUITE CASE VisibilityNotify 9"
-	/tset/Xlib11/VisibilityNotify/VisibilityNotify
+	/Xlib11/VisibilityNotify/VisibilityNotify
 
 
 # Discrete tests for Xlib Chapter 12-Event Handling Functions
 
 XCheckIfEvent
 	"VSW5TESTSUITE CASE XCheckIfEvent 6"
-	/tset/Xlib12/XCheckIfEvent/XCheckIfEvent
+	/Xlib12/XCheckIfEvent/XCheckIfEvent
 
 XCheckMaskEvent
 	"VSW5TESTSUITE CASE XCheckMaskEvent 6"
-	/tset/Xlib12/XCheckMaskEvent/XCheckMaskEvent
+	/Xlib12/XCheckMaskEvent/XCheckMaskEvent
 
 XCheckTypedEvent
 	"VSW5TESTSUITE CASE XCheckTypedEvent 6"
-	/tset/Xlib12/XCheckTypedEvent/XCheckTypedEvent
+	/Xlib12/XCheckTypedEvent/XCheckTypedEvent
 
 XCheckTypedWindowEvent
 	"VSW5TESTSUITE CASE XCheckTypedWindowEvent 6"
-	/tset/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent
+	/Xlib12/XCheckTypedWindowEvent/XCheckTypedWindowEvent
 
 XCheckWindowEvent
 	"VSW5TESTSUITE CASE XCheckWindowEvent 6"
-	/tset/Xlib12/XCheckWindowEvent/XCheckWindowEvent
+	/Xlib12/XCheckWindowEvent/XCheckWindowEvent
 
 XDisplayMotionBufferSize
 	"VSW5TESTSUITE CASE XDisplayMotionBufferSize 2"
-	/tset/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize
+	/Xlib12/XDisplayMotionBufferSize/XDisplayMotionBufferSize
 
 XDisplayName
 	"VSW5TESTSUITE CASE XDisplayName 1"
-	/tset/Xlib12/XDisplayName/XDisplayName
+	/Xlib12/XDisplayName/XDisplayName
 
 XEventsQueued
 	"VSW5TESTSUITE CASE XEventsQueued 6"
-	/tset/Xlib12/XEventsQueued/XEventsQueued
+	/Xlib12/XEventsQueued/XEventsQueued
 
 XFlush
 	"VSW5TESTSUITE CASE XFlush 1"
-	/tset/Xlib12/XFlush/XFlush
+	/Xlib12/XFlush/XFlush
 
 XGetErrorDatabaseText
 	"VSW5TESTSUITE CASE XGetErrorDatabaseText 5"
-	/tset/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText
+	/Xlib12/XGetErrorDatabaseText/XGetErrorDatabaseText
 
 XGetErrorText
 	"VSW5TESTSUITE CASE XGetErrorText 2"
-	/tset/Xlib12/XGetErrorText/XGetErrorText
+	/Xlib12/XGetErrorText/XGetErrorText
 
 XGetMotionEvents
 	"VSW5TESTSUITE CASE XGetMotionEvents 7"
-	/tset/Xlib12/XGetMotionEvents/XGetMotionEvents
+	/Xlib12/XGetMotionEvents/XGetMotionEvents
 
 XIfEvent
 	"VSW5TESTSUITE CASE XIfEvent 4"
-	/tset/Xlib12/XIfEvent/XIfEvent
+	/Xlib12/XIfEvent/XIfEvent
 
 XMaskEvent
 	"VSW5TESTSUITE CASE XMaskEvent 3"
-	/tset/Xlib12/XMaskEvent/XMaskEvent
+	/Xlib12/XMaskEvent/XMaskEvent
 
 XNextEvent
 	"VSW5TESTSUITE CASE XNextEvent 3"
-	/tset/Xlib12/XNextEvent/XNextEvent
+	/Xlib12/XNextEvent/XNextEvent
 
 XPeekEvent
 	"VSW5TESTSUITE CASE XPeekEvent 3"
-	/tset/Xlib12/XPeekEvent/XPeekEvent
+	/Xlib12/XPeekEvent/XPeekEvent
 
 XPeekIfEvent
 	"VSW5TESTSUITE CASE XPeekIfEvent 4"
-	/tset/Xlib12/XPeekIfEvent/XPeekIfEvent
+	/Xlib12/XPeekIfEvent/XPeekIfEvent
 
 XPending
 	"VSW5TESTSUITE CASE XPending 3"
-	/tset/Xlib12/XPending/XPending
+	/Xlib12/XPending/XPending
 
 XPutBackEvent
 	"VSW5TESTSUITE CASE XPutBackEvent 2"
-	/tset/Xlib12/XPutBackEvent/XPutBackEvent
+	/Xlib12/XPutBackEvent/XPutBackEvent
 
 XSelectInput
 	"VSW5TESTSUITE CASE XSelectInput 8"
-	/tset/Xlib12/XSelectInput/XSelectInput
+	/Xlib12/XSelectInput/XSelectInput
 
 XSendEvent
 	"VSW5TESTSUITE CASE XSendEvent 22"
-	/tset/Xlib12/XSendEvent/XSendEvent
+	/Xlib12/XSendEvent/XSendEvent
 
 XSetAfterFunction
 	"VSW5TESTSUITE CASE XSetAfterFunction 3"
-	/tset/Xlib12/XSetAfterFunction/XSetAfterFunction
+	/Xlib12/XSetAfterFunction/XSetAfterFunction
 
 XSetErrorHandler
 	"VSW5TESTSUITE CASE XSetErrorHandler 9"
-	/tset/Xlib12/XSetErrorHandler/XSetErrorHandler
+	/Xlib12/XSetErrorHandler/XSetErrorHandler
 
 XSetIOErrorHandler
 	"VSW5TESTSUITE CASE XSetIOErrorHandler 7"
-	/tset/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler
+	/Xlib12/XSetIOErrorHandler/XSetIOErrorHandler
 
 XSync
 	"VSW5TESTSUITE CASE XSync 5"
-	/tset/Xlib12/XSync/XSync
+	/Xlib12/XSync/XSync
 
 XSynchronize
 	"VSW5TESTSUITE CASE XSynchronize 5"
-	/tset/Xlib12/XSynchronize/XSynchronize
+	/Xlib12/XSynchronize/XSynchronize
 
 XWindowEvent
 	"VSW5TESTSUITE CASE XWindowEvent 3"
-	/tset/Xlib12/XWindowEvent/XWindowEvent
+	/Xlib12/XWindowEvent/XWindowEvent
 
 
 # Discrete tests for Xlib Chapter 13-Input Device Functions
 
 XAllowEvents
 	"VSW5TESTSUITE CASE XAllowEvents 29"
-	/tset/Xlib13/XAllowEvents/XAllowEvents
+	/Xlib13/XAllowEvents/XAllowEvents
 
 XAutoRepeatOff
 	"VSW5TESTSUITE CASE XAutoRepeatOff 1"
-	/tset/Xlib13/XAutoRepeatOff/XAutoRepeatOff
+	/Xlib13/XAutoRepeatOff/XAutoRepeatOff
 
 XAutoRepeatOn
 	"VSW5TESTSUITE CASE XAutoRepeatOn 1"
-	/tset/Xlib13/XAutoRepeatOn/XAutoRepeatOn
+	/Xlib13/XAutoRepeatOn/XAutoRepeatOn
 
 XBell
 	"VSW5TESTSUITE CASE XBell 3"
-	/tset/Xlib13/XBell/XBell
+	/Xlib13/XBell/XBell
 
 XChangeActivePointerGrab
 	"VSW5TESTSUITE CASE XChangeActivePointerGrab 5"
-	/tset/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab
+	/Xlib13/XChangeActivePointerGrab/XChangeActivePointerGrab
 
 XChangeKeyboardControl
 	"VSW5TESTSUITE CASE XChangeKeyboardControl 20"
-	/tset/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl
+	/Xlib13/XChangeKeyboardControl/XChangeKeyboardControl
 
 XChangeKeyboardMapping
 	"VSW5TESTSUITE CASE XChangeKeyboardMapping 7"
-	/tset/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping
+	/Xlib13/XChangeKeyboardMapping/XChangeKeyboardMapping
 
 XChangePointerControl
 	"VSW5TESTSUITE CASE XChangePointerControl 11"
-	/tset/Xlib13/XChangePointerControl/XChangePointerControl
+	/Xlib13/XChangePointerControl/XChangePointerControl
 
 XDeleteModifiermapEntry
 	"VSW5TESTSUITE CASE XDeleteModifiermapEntry 1"
-	/tset/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry
+	/Xlib13/XDeleteModifiermapEntry/XDeleteModifiermapEntry
 
 XDisplayKeycodes
 	"VSW5TESTSUITE CASE XDisplayKeycodes 3"
-	/tset/Xlib13/XDisplayKeycodes/XDisplayKeycodes
+	/Xlib13/XDisplayKeycodes/XDisplayKeycodes
 
 XFreeModifiermap
 	"VSW5TESTSUITE CASE XFreeModifiermap 1"
-	/tset/Xlib13/XFreeModifiermap/XFreeModifiermap
+	/Xlib13/XFreeModifiermap/XFreeModifiermap
 
 XGrabButton
 	"VSW5TESTSUITE CASE XGrabButton 39"
-	/tset/Xlib13/XGrabButton/XGrabButton
+	/Xlib13/XGrabButton/XGrabButton
 
 XGrabKey
 	"VSW5TESTSUITE CASE XGrabKey 16"
-	/tset/Xlib13/XGrabKey/XGrabKey
+	/Xlib13/XGrabKey/XGrabKey
 
 XGrabKeyboard
 	"VSW5TESTSUITE CASE XGrabKeyboard 25"
-	/tset/Xlib13/XGrabKeyboard/XGrabKeyboard
+	/Xlib13/XGrabKeyboard/XGrabKeyboard
 
 XGrabPointer
 	"VSW5TESTSUITE CASE XGrabPointer 34"
-	/tset/Xlib13/XGrabPointer/XGrabPointer
+	/Xlib13/XGrabPointer/XGrabPointer
 
 XGetInputFocus
 	"VSW5TESTSUITE CASE XGetInputFocus 1"
-	/tset/Xlib13/XGetInputFocus/XGetInputFocus
+	/Xlib13/XGetInputFocus/XGetInputFocus
 
 XGetKeyboardControl
 	"VSW5TESTSUITE CASE XGetKeyboardControl 1"
-	/tset/Xlib13/XGetKeyboardControl/XGetKeyboardControl
+	/Xlib13/XGetKeyboardControl/XGetKeyboardControl
 
 XGetKeyboardMapping
 	"VSW5TESTSUITE CASE XGetKeyboardMapping 6"
-	/tset/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping
+	/Xlib13/XGetKeyboardMapping/XGetKeyboardMapping
 
 XGetModifierMapping
 	"VSW5TESTSUITE CASE XGetModifierMapping 2"
-	/tset/Xlib13/XGetModifierMapping/XGetModifierMapping
+	/Xlib13/XGetModifierMapping/XGetModifierMapping
 
 XGetPointerControl
 	"VSW5TESTSUITE CASE XGetPointerControl 1"
-	/tset/Xlib13/XGetPointerControl/XGetPointerControl
+	/Xlib13/XGetPointerControl/XGetPointerControl
 
 XGetPointerMapping
 	"VSW5TESTSUITE CASE XGetPointerMapping 3"
-	/tset/Xlib13/XGetPointerMapping/XGetPointerMapping
+	/Xlib13/XGetPointerMapping/XGetPointerMapping
 
 XInsertModifiermapEntry
 	"VSW5TESTSUITE CASE XInsertModifiermapEntry 1"
-	/tset/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry
+	/Xlib13/XInsertModifiermapEntry/XInsertModifiermapEntry
 
 XNewModifiermap
 	"VSW5TESTSUITE CASE XNewModifiermap 1"
-	/tset/Xlib13/XNewModifiermap/XNewModifiermap
+	/Xlib13/XNewModifiermap/XNewModifiermap
 
 XQueryKeymap
 	"VSW5TESTSUITE CASE XQueryKeymap 1"
-	/tset/Xlib13/XQueryKeymap/XQueryKeymap
+	/Xlib13/XQueryKeymap/XQueryKeymap
 
 XSetInputFocus
 	"VSW5TESTSUITE CASE XSetInputFocus 13"
-	/tset/Xlib13/XSetInputFocus/XSetInputFocus
+	/Xlib13/XSetInputFocus/XSetInputFocus
 
 XSetModifierMapping
 	"VSW5TESTSUITE CASE XSetModifierMapping 8"
-	/tset/Xlib13/XSetModifierMapping/XSetModifierMapping
+	/Xlib13/XSetModifierMapping/XSetModifierMapping
 
 XSetPointerMapping
 	"VSW5TESTSUITE CASE XSetPointerMapping 7"
-	/tset/Xlib13/XSetPointerMapping/XSetPointerMapping
+	/Xlib13/XSetPointerMapping/XSetPointerMapping
 
 XUngrabButton
 	"VSW5TESTSUITE CASE XUngrabButton 6"
-	/tset/Xlib13/XUngrabButton/XUngrabButton
+	/Xlib13/XUngrabButton/XUngrabButton
 
 XUngrabKey
 	"VSW5TESTSUITE CASE XUngrabKey 7"
-	/tset/Xlib13/XUngrabKey/XUngrabKey
+	/Xlib13/XUngrabKey/XUngrabKey
 
 XUngrabKeyboard
 	"VSW5TESTSUITE CASE XUngrabKeyboard 3"
-	/tset/Xlib13/XUngrabKeyboard/XUngrabKeyboard
+	/Xlib13/XUngrabKeyboard/XUngrabKeyboard
 
 XUngrabPointer
 	"VSW5TESTSUITE CASE XUngrabPointer 3"
-	/tset/Xlib13/XUngrabPointer/XUngrabPointer
+	/Xlib13/XUngrabPointer/XUngrabPointer
 
 XWarpPointer
 	"VSW5TESTSUITE CASE XWarpPointer 9"
-	/tset/Xlib13/XWarpPointer/XWarpPointer
+	/Xlib13/XWarpPointer/XWarpPointer
 
 # Discrete tests for Xlib Chapter 14-Locales and Internationalized Text Functions
 
 XBaseFontNameListOfFontSet
 	"VSW5TESTSUITE CASE XBaseFontNameListOfFontSet 1"
-	/tset/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet
+	/Xlib14/XBaseFontNameListOfFontSet/XBaseFontNameListOfFontSet
 
 XCloseIM
 	"VSW5TESTSUITE CASE XCloseIM 1"
-	/tset/Xlib14/XCloseIM/XCloseIM
+	/Xlib14/XCloseIM/XCloseIM
 
 XContextDependentDrawing
 	"VSW5TESTSUITE CASE XContextDependentDrawing 1"
-	/tset/Xlib14/XContextDependentDrawing/XContextDependentDrawing
+	/Xlib14/XContextDependentDrawing/XContextDependentDrawing
 
 XCreateFontSet
 	"VSW5TESTSUITE CASE XCreateFontSet 1"
-	/tset/Xlib14/XCreateFontSet/XCreateFontSet
+	/Xlib14/XCreateFontSet/XCreateFontSet
 
 XCreateIC
 	"VSW5TESTSUITE CASE XCreateIC 1"
-	/tset/Xlib14/XCreateIC/XCreateIC
+	/Xlib14/XCreateIC/XCreateIC
 
 XDestroyIC
 	"VSW5TESTSUITE CASE XDestroyIC 1"
-	/tset/Xlib14/XDestroyIC/XDestroyIC
+	/Xlib14/XDestroyIC/XDestroyIC
 
 XDisplayOfIM
 	"VSW5TESTSUITE CASE XDisplayOfIM 1"
-	/tset/Xlib14/XDisplayOfIM/XDisplayOfIM
+	/Xlib14/XDisplayOfIM/XDisplayOfIM
 
 XExtentsOfFontSet
 	"VSW5TESTSUITE CASE XExtentsOfFontSet 1"
-	/tset/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet
+	/Xlib14/XExtentsOfFontSet/XExtentsOfFontSet
 
 XFilterEvent
 	"VSW5TESTSUITE CASE XFilterEvent 1"
-	/tset/Xlib14/XFilterEvent/XFilterEvent
+	/Xlib14/XFilterEvent/XFilterEvent
 
 XFontsOfFontSet
 	"VSW5TESTSUITE CASE XFontsOfFontSet 1"
-	/tset/Xlib14/XFontsOfFontSet/XFontsOfFontSet
+	/Xlib14/XFontsOfFontSet/XFontsOfFontSet
 
 XFreeFontSet
 	"VSW5TESTSUITE CASE XFreeFontSet 1"
-	/tset/Xlib14/XFreeFontSet/XFreeFontSet
+	/Xlib14/XFreeFontSet/XFreeFontSet
 
 XGetICValues
 	"VSW5TESTSUITE CASE XGetICValues 3"
-	/tset/Xlib14/XGetICValues/XGetICValues
+	/Xlib14/XGetICValues/XGetICValues
 
 XGetIMValues
 	"VSW5TESTSUITE CASE XGetIMValues 1"
-	/tset/Xlib14/XGetIMValues/XGetIMValues
+	/Xlib14/XGetIMValues/XGetIMValues
 
 XIMOfIC
 	"VSW5TESTSUITE CASE XIMOfIC 1"
-	/tset/Xlib14/XIMOfIC/XIMOfIC
+	/Xlib14/XIMOfIC/XIMOfIC
 
 XLocaleOfFontSet
 	"VSW5TESTSUITE CASE XLocaleOfFontSet 1"
-	/tset/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet
+	/Xlib14/XLocaleOfFontSet/XLocaleOfFontSet
 
 XLocaleOfIM
 	"VSW5TESTSUITE CASE XLocaleOfIM 1"
-	/tset/Xlib14/XLocaleOfIM/XLocaleOfIM
+	/Xlib14/XLocaleOfIM/XLocaleOfIM
 
 XmbDrawImageString
 	"VSW5TESTSUITE CASE XmbDrawImageString 1"
-	/tset/Xlib14/XmbDrawImageString/XmbDrawImageString
+	/Xlib14/XmbDrawImageString/XmbDrawImageString
 
 XmbDrawString
 	"VSW5TESTSUITE CASE XmbDrawString 1"
-	/tset/Xlib14/XmbDrawString/XmbDrawString
+	/Xlib14/XmbDrawString/XmbDrawString
 
 XmbDrawText
 	"VSW5TESTSUITE CASE XmbDrawText 1"
-	/tset/Xlib14/XmbDrawText/XmbDrawText
+	/Xlib14/XmbDrawText/XmbDrawText
 
 XmbLookupString
 	"VSW5TESTSUITE CASE XmbLookupString 3"
-	/tset/Xlib14/XmbLookupString/XmbLookupString
+	/Xlib14/XmbLookupString/XmbLookupString
 
 XmbResetIC
 	"VSW5TESTSUITE CASE XmbResetIC 1"
-	/tset/Xlib14/XmbResetIC/XmbResetIC
+	/Xlib14/XmbResetIC/XmbResetIC
 
 XmbSetWMProperties
 	"VSW5TESTSUITE CASE XmbSetWMProperties 2"
-	/tset/Xlib14/XmbSetWMProperties/XmbSetWMProperties
+	/Xlib14/XmbSetWMProperties/XmbSetWMProperties
 
 XmbTextEscapement
 	"VSW5TESTSUITE CASE XmbTextEscapement 1"
-	/tset/Xlib14/XmbTextEscapement/XmbTextEscapement
+	/Xlib14/XmbTextEscapement/XmbTextEscapement
 
 XmbTextExtents
 	"VSW5TESTSUITE CASE XmbTextExtents 1"
-	/tset/Xlib14/XmbTextExtents/XmbTextExtents
+	/Xlib14/XmbTextExtents/XmbTextExtents
 
 XmbTextListToTextProperty
 	"VSW5TESTSUITE CASE XmbTextListToTextProperty 1"
-	/tset/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty
+	/Xlib14/XmbTextListToTextProperty/XmbTextListToTextProperty
 
 XmbTextPerCharExtents
 	"VSW5TESTSUITE CASE XmbTextPerCharExtents 1"
-	/tset/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents
+	/Xlib14/XmbTextPerCharExtents/XmbTextPerCharExtents
 
 XmbTextPropertyToTextList
 	"VSW5TESTSUITE CASE XmbTextPropertyToTextList 1"
-	/tset/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList
+	/Xlib14/XmbTextPropertyToTextList/XmbTextPropertyToTextList
 
 XOpenIM
 	"VSW5TESTSUITE CASE XOpenIM 1"
-	/tset/Xlib14/XOpenIM/XOpenIM
+	/Xlib14/XOpenIM/XOpenIM
 
 XSetICFocus
 	"VSW5TESTSUITE CASE XSetICFocus 1"
-	/tset/Xlib14/XSetICFocus/XSetICFocus
+	/Xlib14/XSetICFocus/XSetICFocus
 
 XSetICValues
 	"VSW5TESTSUITE CASE XSetICValues 4"
-	/tset/Xlib14/XSetICValues/XSetICValues
+	/Xlib14/XSetICValues/XSetICValues
 
 XSupportsLocale
 	"VSW5TESTSUITE CASE XSupportsLocale 1"
-	/tset/Xlib14/XSupportsLocale/XSupportsLocale
+	/Xlib14/XSupportsLocale/XSupportsLocale
 
 XSetLocaleModifiers
 	"VSW5TESTSUITE CASE XSetLocaleModifiers 1"
-	/tset/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers
+	/Xlib14/XSetLocaleModifiers/XSetLocaleModifiers
 
 XUnsetICFocus
 	"VSW5TESTSUITE CASE XUnsetICFocus 1"
-	/tset/Xlib14/XUnsetICFocus/XUnsetICFocus
+	/Xlib14/XUnsetICFocus/XUnsetICFocus
 
 XVaCreateNestedList
 	"VSW5TESTSUITE CASE XVaCreateNestedList 4"
-	/tset/Xlib14/XVaCreateNestedList/XVaCreateNestedList
+	/Xlib14/XVaCreateNestedList/XVaCreateNestedList
 
 XwcDrawImageString
 	"VSW5TESTSUITE CASE XwcDrawImageString 1"
-	/tset/Xlib14/XwcDrawImageString/XwcDrawImageString
+	/Xlib14/XwcDrawImageString/XwcDrawImageString
 
 XwcDrawString
 	"VSW5TESTSUITE CASE XwcDrawString 1"
-	/tset/Xlib14/XwcDrawString/XwcDrawString
+	/Xlib14/XwcDrawString/XwcDrawString
 
 XwcDrawText
 	"VSW5TESTSUITE CASE XwcDrawText 1"
-	/tset/Xlib14/XwcDrawText/XwcDrawText
+	/Xlib14/XwcDrawText/XwcDrawText
 
 XwcFreeStringList
 	"VSW5TESTSUITE CASE XwcFreeStringList 1"
-	/tset/Xlib14/XwcFreeStringList/XwcFreeStringList
+	/Xlib14/XwcFreeStringList/XwcFreeStringList
 
 XwcLookupString
 	"VSW5TESTSUITE CASE XwcLookupString 3"
-	/tset/Xlib14/XwcLookupString/XwcLookupString
+	/Xlib14/XwcLookupString/XwcLookupString
 
 XwcResetIC
 	"VSW5TESTSUITE CASE XwcResetIC 1"
-	/tset/Xlib14/XwcResetIC/XwcResetIC
+	/Xlib14/XwcResetIC/XwcResetIC
 
 XwcTextEscapement
 	"VSW5TESTSUITE CASE XwcTextEscapement 1"
-	/tset/Xlib14/XwcTextEscapement/XwcTextEscapement
+	/Xlib14/XwcTextEscapement/XwcTextEscapement
 
 XwcTextListToTextProperty
 	"VSW5TESTSUITE CASE XwcTextListToTextProperty 1"
-	/tset/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty
+	/Xlib14/XwcTextListToTextProperty/XwcTextListToTextProperty
 
 XwcTextPerCharExtents
 	"VSW5TESTSUITE CASE XwcTextPerCharExtents 1"
-	/tset/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents
+	/Xlib14/XwcTextPerCharExtents/XwcTextPerCharExtents
 
 XwcTextPropertyToTextList
 	"VSW5TESTSUITE CASE XwcTextPropertyToTextList 1"
-	/tset/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList
+	/Xlib14/XwcTextPropertyToTextList/XwcTextPropertyToTextList
 
 XwcTextExtents
 	"VSW5TESTSUITE CASE XwcTextExtents 1"
-	/tset/Xlib14/XwcTextExtents/XwcTextExtents
+	/Xlib14/XwcTextExtents/XwcTextExtents
 
 
 # Discrete tests for Xlib Chapter 15-Inter-Client Communication Functions
 
 XAllocClassHint
 	"VSW5TESTSUITE CASE XAllocClassHint 2"
-	/tset/Xlib15/XAllocClassHint/XAllocClassHint
+	/Xlib15/XAllocClassHint/XAllocClassHint
 
 XAllocIconSize
 	"VSW5TESTSUITE CASE XAllocIconSize 2"
-	/tset/Xlib15/XAllocIconSize/XAllocIconSize
+	/Xlib15/XAllocIconSize/XAllocIconSize
 
 XAllocStandardColormap
 	"VSW5TESTSUITE CASE XAllocStandardColormap 2"
-	/tset/Xlib15/XAllocStandardColormap/XAllocStandardColormap
+	/Xlib15/XAllocStandardColormap/XAllocStandardColormap
 
 XAllocSizeHints
 	"VSW5TESTSUITE CASE XAllocSizeHints 2"
-	/tset/Xlib15/XAllocSizeHints/XAllocSizeHints
+	/Xlib15/XAllocSizeHints/XAllocSizeHints
 
 XAllocWMHints
 	"VSW5TESTSUITE CASE XAllocWMHints 2"
-	/tset/Xlib15/XAllocWMHints/XAllocWMHints
+	/Xlib15/XAllocWMHints/XAllocWMHints
 
 XFreeStringList
 	"VSW5TESTSUITE CASE XFreeStringList 1"
-	/tset/Xlib15/XFreeStringList/XFreeStringList
+	/Xlib15/XFreeStringList/XFreeStringList
 
 XFetchName
 	"VSW5TESTSUITE CASE XFetchName 3"
-	/tset/Xlib15/XFetchName/XFetchName
+	/Xlib15/XFetchName/XFetchName
 
 XGetClassHint
 	"VSW5TESTSUITE CASE XGetClassHint 3"
-	/tset/Xlib15/XGetClassHint/XGetClassHint
+	/Xlib15/XGetClassHint/XGetClassHint
 
 XGetCommand
 	"VSW5TESTSUITE CASE XGetCommand 3"
-	/tset/Xlib15/XGetCommand/XGetCommand
+	/Xlib15/XGetCommand/XGetCommand
 
 XGetIconName
 	"VSW5TESTSUITE CASE XGetIconName 3"
-	/tset/Xlib15/XGetIconName/XGetIconName
+	/Xlib15/XGetIconName/XGetIconName
 
 XGetIconSizes
 	"VSW5TESTSUITE CASE XGetIconSizes 3"
-	/tset/Xlib15/XGetIconSizes/XGetIconSizes
+	/Xlib15/XGetIconSizes/XGetIconSizes
 
 XGetRGBColormaps
 	"VSW5TESTSUITE CASE XGetRGBColormaps 6"
-	/tset/Xlib15/XGetRGBColormaps/XGetRGBColormaps
+	/Xlib15/XGetRGBColormaps/XGetRGBColormaps
 
 XGetTransientForHint
 	"VSW5TESTSUITE CASE XGetTransientForHint 3"
-	/tset/Xlib15/XGetTransientForHint/XGetTransientForHint
+	/Xlib15/XGetTransientForHint/XGetTransientForHint
 
 XGetTextProperty
 	"VSW5TESTSUITE CASE XGetTextProperty 4"
-	/tset/Xlib15/XGetTextProperty/XGetTextProperty
+	/Xlib15/XGetTextProperty/XGetTextProperty
 
 XGetWMClientMachine
 	"VSW5TESTSUITE CASE XGetWMClientMachine 3"
-	/tset/Xlib15/XGetWMClientMachine/XGetWMClientMachine
+	/Xlib15/XGetWMClientMachine/XGetWMClientMachine
 
 XGetWMColormapWindows
 	"VSW5TESTSUITE CASE XGetWMColormapWindows 4"
-	/tset/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows
+	/Xlib15/XGetWMColormapWindows/XGetWMColormapWindows
 
 XGetWMHints
 	"VSW5TESTSUITE CASE XGetWMHints 3"
-	/tset/Xlib15/XGetWMHints/XGetWMHints
+	/Xlib15/XGetWMHints/XGetWMHints
 
 XGetWMIconName
 	"VSW5TESTSUITE CASE XGetWMIconName 3"
-	/tset/Xlib15/XGetWMIconName/XGetWMIconName
+	/Xlib15/XGetWMIconName/XGetWMIconName
 
 XGetWMName
 	"VSW5TESTSUITE CASE XGetWMName 3"
-	/tset/Xlib15/XGetWMName/XGetWMName
+	/Xlib15/XGetWMName/XGetWMName
 
 XGetWMNormalHints
 	"VSW5TESTSUITE CASE XGetWMNormalHints 5"
-	/tset/Xlib15/XGetWMNormalHints/XGetWMNormalHints
+	/Xlib15/XGetWMNormalHints/XGetWMNormalHints
 
 XGetWMProtocols
 	"VSW5TESTSUITE CASE XGetWMProtocols 4"
-	/tset/Xlib15/XGetWMProtocols/XGetWMProtocols
+	/Xlib15/XGetWMProtocols/XGetWMProtocols
 
 XGetWMSizeHints
 	"VSW5TESTSUITE CASE XGetWMSizeHints 6"
-	/tset/Xlib15/XGetWMSizeHints/XGetWMSizeHints
+	/Xlib15/XGetWMSizeHints/XGetWMSizeHints
 
 XIconifyWindow
 	"VSW5TESTSUITE CASE XIconifyWindow 3"
-	/tset/Xlib15/XIconifyWindow/XIconifyWindow
+	/Xlib15/XIconifyWindow/XIconifyWindow
 
 XReconfigureWMWindow
 	"VSW5TESTSUITE CASE XReconfigureWMWindow 5"
-	/tset/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow
+	/Xlib15/XReconfigureWMWindow/XReconfigureWMWindow
 
 XSetClassHint
 	"VSW5TESTSUITE CASE XSetClassHint 3"
-	/tset/Xlib15/XSetClassHint/XSetClassHint
+	/Xlib15/XSetClassHint/XSetClassHint
 
 XSetCommand
 	"VSW5TESTSUITE CASE XSetCommand 3"
-	/tset/Xlib15/XSetCommand/XSetCommand
+	/Xlib15/XSetCommand/XSetCommand
 
 XSetIconName
 	"VSW5TESTSUITE CASE XSetIconName 3"
-	/tset/Xlib15/XSetIconName/XSetIconName
+	/Xlib15/XSetIconName/XSetIconName
 
 XSetIconSizes
 	"VSW5TESTSUITE CASE XSetIconSizes 3"
-	/tset/Xlib15/XSetIconSizes/XSetIconSizes
+	/Xlib15/XSetIconSizes/XSetIconSizes
 
 XSetRGBColormaps
 	"VSW5TESTSUITE CASE XSetRGBColormaps 4"
-	/tset/Xlib15/XSetRGBColormaps/XSetRGBColormaps
+	/Xlib15/XSetRGBColormaps/XSetRGBColormaps
 
 XStringListToTextProperty
 	"VSW5TESTSUITE CASE XStringListToTextProperty 3"
-	/tset/Xlib15/XStringListToTextProperty/XStringListToTextProperty
+	/Xlib15/XStringListToTextProperty/XStringListToTextProperty
 
 XStoreName
 	"VSW5TESTSUITE CASE XStoreName 3"
-	/tset/Xlib15/XStoreName/XStoreName
+	/Xlib15/XStoreName/XStoreName
 
 XSetTransientForHint
 	"VSW5TESTSUITE CASE XSetTransientForHint 3"
-	/tset/Xlib15/XSetTransientForHint/XSetTransientForHint
+	/Xlib15/XSetTransientForHint/XSetTransientForHint
 
 XSetTextProperty
 	"VSW5TESTSUITE CASE XSetTextProperty 5"
-	/tset/Xlib15/XSetTextProperty/XSetTextProperty
+	/Xlib15/XSetTextProperty/XSetTextProperty
 
 XSetWMClientMachine
 	"VSW5TESTSUITE CASE XSetWMClientMachine 5"
-	/tset/Xlib15/XSetWMClientMachine/XSetWMClientMachine
+	/Xlib15/XSetWMClientMachine/XSetWMClientMachine
 
 XSetWMColormapWindows
 	"VSW5TESTSUITE CASE XSetWMColormapWindows 4"
-	/tset/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows
+	/Xlib15/XSetWMColormapWindows/XSetWMColormapWindows
 
 XSetWMHints
 	"VSW5TESTSUITE CASE XSetWMHints 3"
-	/tset/Xlib15/XSetWMHints/XSetWMHints
+	/Xlib15/XSetWMHints/XSetWMHints
 
 XSetWMIconName
 	"VSW5TESTSUITE CASE XSetWMIconName 5"
-	/tset/Xlib15/XSetWMIconName/XSetWMIconName
+	/Xlib15/XSetWMIconName/XSetWMIconName
 
 XSetWMName
 	"VSW5TESTSUITE CASE XSetWMName 5"
-	/tset/Xlib15/XSetWMName/XSetWMName
+	/Xlib15/XSetWMName/XSetWMName
 
 XSetWMNormalHints
 	"VSW5TESTSUITE CASE XSetWMNormalHints 3"
-	/tset/Xlib15/XSetWMNormalHints/XSetWMNormalHints
+	/Xlib15/XSetWMNormalHints/XSetWMNormalHints
 
 XSetWMProperties
 	"VSW5TESTSUITE CASE XSetWMProperties 10"
-	/tset/Xlib15/XSetWMProperties/XSetWMProperties
+	/Xlib15/XSetWMProperties/XSetWMProperties
 
 XSetWMProtocols
 	"VSW5TESTSUITE CASE XSetWMProtocols 4"
-	/tset/Xlib15/XSetWMProtocols/XSetWMProtocols
+	/Xlib15/XSetWMProtocols/XSetWMProtocols
 
 XSetWMSizeHints
 	"VSW5TESTSUITE CASE XSetWMSizeHints 4"
-	/tset/Xlib15/XSetWMSizeHints/XSetWMSizeHints
+	/Xlib15/XSetWMSizeHints/XSetWMSizeHints
 
 XTextPropertyToStringList
 	"VSW5TESTSUITE CASE XTextPropertyToStringList 4"
-	/tset/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList
+	/Xlib15/XTextPropertyToStringList/XTextPropertyToStringList
 
 XWithdrawWindow
 	"VSW5TESTSUITE CASE XWithdrawWindow 3"
-	/tset/Xlib15/XWithdrawWindow/XWithdrawWindow
+	/Xlib15/XWithdrawWindow/XWithdrawWindow
 
 XDefaultString
 	"VSW5TESTSUITE CASE XDefaultString 1"
-	/tset/Xlib15/XDefaultString/XDefaultString
+	/Xlib15/XDefaultString/XDefaultString
 
 
 # Discrete tests for Xlib Chapter 16 - Resource Manager Functions
 
 XrmDestroyDatabase
 	"VSW5TESTSUITE CASE XrmDestroyDatabase 3"
-	/tset/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase
+	/Xlib16/XrmDestroyDatabase/XrmDestroyDatabase
 
 XrmGetFileDatabase
 	"VSW5TESTSUITE CASE XrmGetFileDatabase 3"
-	/tset/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase
+	/Xlib16/XrmGetFileDatabase/XrmGetFileDatabase
 
 XrmGetResource
 	"VSW5TESTSUITE CASE XrmGetResource 2"
-	/tset/Xlib16/XrmGetResource/XrmGetResource
+	/Xlib16/XrmGetResource/XrmGetResource
 
 XrmGetStringDatabase
 	"VSW5TESTSUITE CASE XrmGetStringDatabase 2"
-	/tset/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase
+	/Xlib16/XrmGetStringDatabase/XrmGetStringDatabase
 
 XrmInitialize
 	"VSW5TESTSUITE CASE XrmInitialize 1"
-	/tset/Xlib16/XrmInitialize/XrmInitialize
+	/Xlib16/XrmInitialize/XrmInitialize
 
 XrmMergeDatabases
 	"VSW5TESTSUITE CASE XrmMergeDatabases 6"
-	/tset/Xlib16/XrmMergeDatabases/XrmMergeDatabases
+	/Xlib16/XrmMergeDatabases/XrmMergeDatabases
 
 XrmParseCommand
 	"VSW5TESTSUITE CASE XrmParseCommand 12"
-	/tset/Xlib16/XrmParseCommand/XrmParseCommand
+	/Xlib16/XrmParseCommand/XrmParseCommand
 
 XrmPutFileDatabase
 	"VSW5TESTSUITE CASE XrmPutFileDatabase 3"
-	/tset/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase
+	/Xlib16/XrmPutFileDatabase/XrmPutFileDatabase
 
 XrmPutLineResource
 	"VSW5TESTSUITE CASE XrmPutLineResource 9"
-	/tset/Xlib16/XrmPutLineResource/XrmPutLineResource
+	/Xlib16/XrmPutLineResource/XrmPutLineResource
 
 XrmPutResource
 	"VSW5TESTSUITE CASE XrmPutResource 4"
-	/tset/Xlib16/XrmPutResource/XrmPutResource
+	/Xlib16/XrmPutResource/XrmPutResource
 
 XrmPutStringResource
 	"VSW5TESTSUITE CASE XrmPutStringResource 4"
-	/tset/Xlib16/XrmPutStringResource/XrmPutStringResource
+	/Xlib16/XrmPutStringResource/XrmPutStringResource
 
 XrmQGetResource
 	"VSW5TESTSUITE CASE XrmQGetResource 2"
-	/tset/Xlib16/XrmQGetResource/XrmQGetResource
+	/Xlib16/XrmQGetResource/XrmQGetResource
 
 XrmQGetSearchList
 	"VSW5TESTSUITE CASE XrmQGetSearchList 4"
-	/tset/Xlib16/XrmQGetSearchList/XrmQGetSearchList
+	/Xlib16/XrmQGetSearchList/XrmQGetSearchList
 
 XrmQGetSearchResource
 	"VSW5TESTSUITE CASE XrmQGetSearchResource 2"
-	/tset/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource
+	/Xlib16/XrmQGetSearchResource/XrmQGetSearchResource
 
 XrmQPutResource
 	"VSW5TESTSUITE CASE XrmQPutResource 3"
-	/tset/Xlib16/XrmQPutResource/XrmQPutResource
+	/Xlib16/XrmQPutResource/XrmQPutResource
 
 XrmQPutStringResource
 	"VSW5TESTSUITE CASE XrmQPutStringResource 3"
-	/tset/Xlib16/XrmQPutStringResource/XrmQPutStringResource
+	/Xlib16/XrmQPutStringResource/XrmQPutStringResource
 
 XrmQuarkToString
 	"VSW5TESTSUITE CASE XrmQuarkToString 3"
-	/tset/Xlib16/XrmQuarkToString/XrmQuarkToString
+	/Xlib16/XrmQuarkToString/XrmQuarkToString
 
 XrmStringToBindingQuarkList
 	"VSW5TESTSUITE CASE XrmStringToBindingQuarkList 6"
-	/tset/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList
+	/Xlib16/XrmStringToBindingQuarkList/XrmStringToBindingQuarkList
 
 XrmStringToQuark
 	"VSW5TESTSUITE CASE XrmStringToQuark 3"
-	/tset/Xlib16/XrmStringToQuark/XrmStringToQuark
+	/Xlib16/XrmStringToQuark/XrmStringToQuark
 
 XrmStringToQuarkList
 	"VSW5TESTSUITE CASE XrmStringToQuarkList 3"
-	/tset/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList
+	/Xlib16/XrmStringToQuarkList/XrmStringToQuarkList
 
 XrmUniqueQuark
 	"VSW5TESTSUITE CASE XrmUniqueQuark 1"
-	/tset/Xlib16/XrmUniqueQuark/XrmUniqueQuark
+	/Xlib16/XrmUniqueQuark/XrmUniqueQuark
 
 XResourceManagerString
 	"VSW5TESTSUITE CASE XResourceManagerString 2"
-	/tset/Xlib16/XResourceManagerString/XResourceManagerString
+	/Xlib16/XResourceManagerString/XResourceManagerString
 
 XrmCombineDatabase
 	"VSW5TESTSUITE CASE XrmCombineDatabase 6"
-	/tset/Xlib16/XrmCombineDatabase/XrmCombineDatabase
+	/Xlib16/XrmCombineDatabase/XrmCombineDatabase
 
 XrmCombineFileDatabase
 	"VSW5TESTSUITE CASE XrmCombineFileDatabase 6"
-	/tset/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase
+	/Xlib16/XrmCombineFileDatabase/XrmCombineFileDatabase
 
 XrmEnumerateDatabase
 	"VSW5TESTSUITE CASE XrmEnumerateDatabase 3"
-	/tset/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase
+	/Xlib16/XrmEnumerateDatabase/XrmEnumerateDatabase
 
 XrmGetDatabase
 	"VSW5TESTSUITE CASE XrmGetDatabase 2"
-	/tset/Xlib16/XrmGetDatabase/XrmGetDatabase
+	/Xlib16/XrmGetDatabase/XrmGetDatabase
 
 XrmLocaleOfDatabase
 	"VSW5TESTSUITE CASE XrmLocaleOfDatabase 1"
-	/tset/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase
+	/Xlib16/XrmLocaleOfDatabase/XrmLocaleOfDatabase
 
 XrmPermStringToQuark
 	"VSW5TESTSUITE CASE XrmPermStringToQuark 2"
-	/tset/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark
+	/Xlib16/XrmPermStringToQuark/XrmPermStringToQuark
 
 XrmSetDatabase
 	"VSW5TESTSUITE CASE XrmSetDatabase 2"
-	/tset/Xlib16/XrmSetDatabase/XrmSetDatabase
+	/Xlib16/XrmSetDatabase/XrmSetDatabase
 
 XScreenResourceString
 	"VSW5TESTSUITE CASE XScreenResourceString 2"
-	/tset/Xlib16/XScreenResourceString/XScreenResourceString
+	/Xlib16/XScreenResourceString/XScreenResourceString
 
 # Discrete tests for Xlib Chapter 17-Application Utility Functions
 
 XAddPixel
 	"VSW5TESTSUITE CASE XAddPixel 1"
-	/tset/Xlib17/XAddPixel/XAddPixel
+	/Xlib17/XAddPixel/XAddPixel
 
 XClipBox
 	"VSW5TESTSUITE CASE XClipBox 1"
-	/tset/Xlib17/XClipBox/XClipBox
+	/Xlib17/XClipBox/XClipBox
 
 XCreateBitmapFromData
 	"VSW5TESTSUITE CASE XCreateBitmapFromData 4"
-	/tset/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData
+	/Xlib17/XCreateBitmapFromData/XCreateBitmapFromData
 
 XCreateImage
 	"VSW5TESTSUITE CASE XCreateImage 3"
-	/tset/Xlib17/XCreateImage/XCreateImage
+	/Xlib17/XCreateImage/XCreateImage
 
 XCreatePixmapFromBitmapData
 	"VSW5TESTSUITE CASE XCreatePixmapFromBitmapData 5"
-	/tset/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
+	/Xlib17/XCreatePixmapFromBitmapData/XCreatePixmapFromBitmapData
 
 XCreateRegion
 	"VSW5TESTSUITE CASE XCreateRegion 2"
-	/tset/Xlib17/XCreateRegion/XCreateRegion
+	/Xlib17/XCreateRegion/XCreateRegion
 
 XDeleteContext
 	"VSW5TESTSUITE CASE XDeleteContext 2"
-	/tset/Xlib17/XDeleteContext/XDeleteContext
+	/Xlib17/XDeleteContext/XDeleteContext
 
 XDestroyImage
 	"VSW5TESTSUITE CASE XDestroyImage 1"
-	/tset/Xlib17/XDestroyImage/XDestroyImage
+	/Xlib17/XDestroyImage/XDestroyImage
 
 XDestroyRegion
 	"VSW5TESTSUITE CASE XDestroyRegion 1"
-	/tset/Xlib17/XDestroyRegion/XDestroyRegion
+	/Xlib17/XDestroyRegion/XDestroyRegion
 
 XEmptyRegion
 	"VSW5TESTSUITE CASE XEmptyRegion 2"
-	/tset/Xlib17/XEmptyRegion/XEmptyRegion
+	/Xlib17/XEmptyRegion/XEmptyRegion
 
 XEqualRegion
 	"VSW5TESTSUITE CASE XEqualRegion 4"
-	/tset/Xlib17/XEqualRegion/XEqualRegion
+	/Xlib17/XEqualRegion/XEqualRegion
 
 XFindContext
 	"VSW5TESTSUITE CASE XFindContext 2"
-	/tset/Xlib17/XFindContext/XFindContext
+	/Xlib17/XFindContext/XFindContext
 
 XFetchBuffer
 	"VSW5TESTSUITE CASE XFetchBuffer 2"
-	/tset/Xlib17/XFetchBuffer/XFetchBuffer
+	/Xlib17/XFetchBuffer/XFetchBuffer
 
 XFetchBytes
 	"VSW5TESTSUITE CASE XFetchBytes 2"
-	/tset/Xlib17/XFetchBytes/XFetchBytes
+	/Xlib17/XFetchBytes/XFetchBytes
 
 XGetDefault
 	"VSW5TESTSUITE CASE XGetDefault 5"
-	/tset/Xlib17/XGetDefault/XGetDefault
+	/Xlib17/XGetDefault/XGetDefault
 
 XGetPixel
 	"VSW5TESTSUITE CASE XGetPixel 1"
-	/tset/Xlib17/XGetPixel/XGetPixel
+	/Xlib17/XGetPixel/XGetPixel
 
 XGetVisualInfo
 	"VSW5TESTSUITE CASE XGetVisualInfo 3"
-	/tset/Xlib17/XGetVisualInfo/XGetVisualInfo
+	/Xlib17/XGetVisualInfo/XGetVisualInfo
 
 XIntersectRegion
 	"VSW5TESTSUITE CASE XIntersectRegion 1"
-	/tset/Xlib17/XIntersectRegion/XIntersectRegion
+	/Xlib17/XIntersectRegion/XIntersectRegion
 
 IsCursorKey
 	"VSW5TESTSUITE CASE IsCursorKey 2"
-	/tset/Xlib17/IsCursorKey/IsCursorKey
+	/Xlib17/IsCursorKey/IsCursorKey
 
 IsFunctionKey
 	"VSW5TESTSUITE CASE IsFunctionKey 2"
-	/tset/Xlib17/IsFunctionKey/IsFunctionKey
+	/Xlib17/IsFunctionKey/IsFunctionKey
 
 IsKeypadKey
 	"VSW5TESTSUITE CASE IsKeypadKey 2"
-	/tset/Xlib17/IsKeypadKey/IsKeypadKey
+	/Xlib17/IsKeypadKey/IsKeypadKey
 
 IsModifierKey
 	"VSW5TESTSUITE CASE IsModifierKey 2"
-	/tset/Xlib17/IsModifierKey/IsModifierKey
+	/Xlib17/IsModifierKey/IsModifierKey
 
 IsMiscFunctionKey
 	"VSW5TESTSUITE CASE IsMiscFunctionKey 2"
-	/tset/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey
+	/Xlib17/IsMiscFunctionKey/IsMiscFunctionKey
 
 IsPFKey
 	"VSW5TESTSUITE CASE IsPFKey 2"
-	/tset/Xlib17/IsPFKey/IsPFKey
+	/Xlib17/IsPFKey/IsPFKey
 
 XKeycodeToKeysym
 	"VSW5TESTSUITE CASE XKeycodeToKeysym 2"
-	/tset/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym
+	/Xlib17/XKeycodeToKeysym/XKeycodeToKeysym
 
 XKeysymToKeycode
 	"VSW5TESTSUITE CASE XKeysymToKeycode 2"
-	/tset/Xlib17/XKeysymToKeycode/XKeysymToKeycode
+	/Xlib17/XKeysymToKeycode/XKeysymToKeycode
 
 XKeysymToString
 	"VSW5TESTSUITE CASE XKeysymToString 2"
-	/tset/Xlib17/XKeysymToString/XKeysymToString
+	/Xlib17/XKeysymToString/XKeysymToString
 
 XLookupKeysym
 	"VSW5TESTSUITE CASE XLookupKeysym 2"
-	/tset/Xlib17/XLookupKeysym/XLookupKeysym
+	/Xlib17/XLookupKeysym/XLookupKeysym
 
 XLookupString
 	"VSW5TESTSUITE CASE XLookupString 3"
-	/tset/Xlib17/XLookupString/XLookupString
+	/Xlib17/XLookupString/XLookupString
 
 XMatchVisualInfo
 	"VSW5TESTSUITE CASE XMatchVisualInfo 2"
-	/tset/Xlib17/XMatchVisualInfo/XMatchVisualInfo
+	/Xlib17/XMatchVisualInfo/XMatchVisualInfo
 
 XOffsetRegion
 	"VSW5TESTSUITE CASE XOffsetRegion 1"
-	/tset/Xlib17/XOffsetRegion/XOffsetRegion
+	/Xlib17/XOffsetRegion/XOffsetRegion
 
 XPolygonRegion
 	"VSW5TESTSUITE CASE XPolygonRegion 1"
-	/tset/Xlib17/XPolygonRegion/XPolygonRegion
+	/Xlib17/XPolygonRegion/XPolygonRegion
 
 XPointInRegion
 	"VSW5TESTSUITE CASE XPointInRegion 2"
-	/tset/Xlib17/XPointInRegion/XPointInRegion
+	/Xlib17/XPointInRegion/XPointInRegion
 
 Xpermalloc
 	"VSW5TESTSUITE CASE Xpermalloc 2"
-	/tset/Xlib17/Xpermalloc/Xpermalloc
+	/Xlib17/Xpermalloc/Xpermalloc
 
 XParseGeometry
 	"VSW5TESTSUITE CASE XParseGeometry 3"
-	/tset/Xlib17/XParseGeometry/XParseGeometry
+	/Xlib17/XParseGeometry/XParseGeometry
 
 XPutPixel
 	"VSW5TESTSUITE CASE XPutPixel 1"
-	/tset/Xlib17/XPutPixel/XPutPixel
+	/Xlib17/XPutPixel/XPutPixel
 
 XRebindKeysym
 	"VSW5TESTSUITE CASE XRebindKeysym 2"
-	/tset/Xlib17/XRebindKeysym/XRebindKeysym
+	/Xlib17/XRebindKeysym/XRebindKeysym
 
 XRectInRegion
 	"VSW5TESTSUITE CASE XRectInRegion 3"
-	/tset/Xlib17/XRectInRegion/XRectInRegion
+	/Xlib17/XRectInRegion/XRectInRegion
 
 XReadBitmapFile
 	"VSW5TESTSUITE CASE XReadBitmapFile 9"
-	/tset/Xlib17/XReadBitmapFile/XReadBitmapFile
+	/Xlib17/XReadBitmapFile/XReadBitmapFile
 
 XRefreshKeyboardMapping
 	"VSW5TESTSUITE CASE XRefreshKeyboardMapping 3"
-	/tset/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping
+	/Xlib17/XRefreshKeyboardMapping/XRefreshKeyboardMapping
 
 XRotateBuffers
 	"VSW5TESTSUITE CASE XRotateBuffers 2"
-	/tset/Xlib17/XRotateBuffers/XRotateBuffers
+	/Xlib17/XRotateBuffers/XRotateBuffers
 
 XSubImage
 	"VSW5TESTSUITE CASE XSubImage 1"
-	/tset/Xlib17/XSubImage/XSubImage
+	/Xlib17/XSubImage/XSubImage
 
 XSubtractRegion
 	"VSW5TESTSUITE CASE XSubtractRegion 1"
-	/tset/Xlib17/XSubtractRegion/XSubtractRegion
+	/Xlib17/XSubtractRegion/XSubtractRegion
 
 XShrinkRegion
 	"VSW5TESTSUITE CASE XShrinkRegion 3"
-	/tset/Xlib17/XShrinkRegion/XShrinkRegion
+	/Xlib17/XShrinkRegion/XShrinkRegion
 
 XStoreBuffer
 	"VSW5TESTSUITE CASE XStoreBuffer 2"
-	/tset/Xlib17/XStoreBuffer/XStoreBuffer
+	/Xlib17/XStoreBuffer/XStoreBuffer
 
 XStoreBytes
 	"VSW5TESTSUITE CASE XStoreBytes 2"
-	/tset/Xlib17/XStoreBytes/XStoreBytes
+	/Xlib17/XStoreBytes/XStoreBytes
 
 XSetRegion
 	"VSW5TESTSUITE CASE XSetRegion 2"
-	/tset/Xlib17/XSetRegion/XSetRegion
+	/Xlib17/XSetRegion/XSetRegion
 
 XStringToKeysym
 	"VSW5TESTSUITE CASE XStringToKeysym 2"
-	/tset/Xlib17/XStringToKeysym/XStringToKeysym
+	/Xlib17/XStringToKeysym/XStringToKeysym
 
 XSaveContext
 	"VSW5TESTSUITE CASE XSaveContext 3"
-	/tset/Xlib17/XSaveContext/XSaveContext
+	/Xlib17/XSaveContext/XSaveContext
 
 XUnionRectWithRegion
 	"VSW5TESTSUITE CASE XUnionRectWithRegion 1"
-	/tset/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion
+	/Xlib17/XUnionRectWithRegion/XUnionRectWithRegion
 
 XUnionRegion
 	"VSW5TESTSUITE CASE XUnionRegion 1"
-	/tset/Xlib17/XUnionRegion/XUnionRegion
+	/Xlib17/XUnionRegion/XUnionRegion
 
 XUniqueContext
 	"VSW5TESTSUITE CASE XUniqueContext 1"
-	/tset/Xlib17/XUniqueContext/XUniqueContext
+	/Xlib17/XUniqueContext/XUniqueContext
 
 XWMGeometry
 	"VSW5TESTSUITE CASE XWMGeometry 9"
-	/tset/Xlib17/XWMGeometry/XWMGeometry
+	/Xlib17/XWMGeometry/XWMGeometry
 
 XWriteBitmapFile
 	"VSW5TESTSUITE CASE XWriteBitmapFile 6"
-	/tset/Xlib17/XWriteBitmapFile/XWriteBitmapFile
+	/Xlib17/XWriteBitmapFile/XWriteBitmapFile
 
 XXorRegion
 	"VSW5TESTSUITE CASE XXorRegion 1"
-	/tset/Xlib17/XXorRegion/XXorRegion
+	/Xlib17/XXorRegion/XXorRegion
 
 
 # Discrete tests for Xlib Chapter 3-Display Functions
 
 XAllPlanes
 	"VSW5TESTSUITE CASE XAllPlanes 2"
-	/tset/Xlib3/XAllPlanes/XAllPlanes
+	/Xlib3/XAllPlanes/XAllPlanes
 
 XBlackPixel
 	"VSW5TESTSUITE CASE XBlackPixel 1"
-	/tset/Xlib3/XBlackPixel/XBlackPixel
+	/Xlib3/XBlackPixel/XBlackPixel
 
 XBlackPixelOfScreen
 	"VSW5TESTSUITE CASE XBlackPixelOfScreen 1"
-	/tset/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen
+	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen
 
 XBitmapBitOrder
 	"VSW5TESTSUITE CASE XBitmapBitOrder 1"
-	/tset/Xlib3/XBitmapBitOrder/XBitmapBitOrder
+	/Xlib3/XBitmapBitOrder/XBitmapBitOrder
 
 XBitmapPad
 	"VSW5TESTSUITE CASE XBitmapPad 1"
-	/tset/Xlib3/XBitmapPad/XBitmapPad
+	/Xlib3/XBitmapPad/XBitmapPad
 
 XBitmapUnit
 	"VSW5TESTSUITE CASE XBitmapUnit 1"
-	/tset/Xlib3/XBitmapUnit/XBitmapUnit
+	/Xlib3/XBitmapUnit/XBitmapUnit
 
 XCellsOfScreen
 	"VSW5TESTSUITE CASE XCellsOfScreen 1"
-	/tset/Xlib3/XCellsOfScreen/XCellsOfScreen
+	/Xlib3/XCellsOfScreen/XCellsOfScreen
 
 XCloseDisplay
 	"VSW5TESTSUITE CASE XCloseDisplay 28"
-	/tset/Xlib3/XCloseDisplay/XCloseDisplay
+	/Xlib3/XCloseDisplay/XCloseDisplay
 
 XConnectionNumber
 	"VSW5TESTSUITE CASE XConnectionNumber 1"
-	/tset/Xlib3/XConnectionNumber/XConnectionNumber
+	/Xlib3/XConnectionNumber/XConnectionNumber
 
 XDefaultColormap
 	"VSW5TESTSUITE CASE XDefaultColormap 1"
-	/tset/Xlib3/XDefaultColormap/XDefaultColormap
+	/Xlib3/XDefaultColormap/XDefaultColormap
 
 XDefaultColormapOfScreen
 	"VSW5TESTSUITE CASE XDefaultColormapOfScreen 1"
-	/tset/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen
+	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen
 
 XDefaultDepth
 	"VSW5TESTSUITE CASE XDefaultDepth 1"
-	/tset/Xlib3/XDefaultDepth/XDefaultDepth
+	/Xlib3/XDefaultDepth/XDefaultDepth
 
 XDefaultDepthOfScreen
 	"VSW5TESTSUITE CASE XDefaultDepthOfScreen 1"
-	/tset/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen
+	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen
 
 XDefaultGC
 	"VSW5TESTSUITE CASE XDefaultGC 1"
-	/tset/Xlib3/XDefaultGC/XDefaultGC
+	/Xlib3/XDefaultGC/XDefaultGC
 
 XDefaultGCOfScreen
 	"VSW5TESTSUITE CASE XDefaultGCOfScreen 2"
-	/tset/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen
+	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen
 
 XDefaultRootWindow
 	"VSW5TESTSUITE CASE XDefaultRootWindow 1"
-	/tset/Xlib3/XDefaultRootWindow/XDefaultRootWindow
+	/Xlib3/XDefaultRootWindow/XDefaultRootWindow
 
 XDefaultScreen
 	"VSW5TESTSUITE CASE XDefaultScreen 1"
-	/tset/Xlib3/XDefaultScreen/XDefaultScreen
+	/Xlib3/XDefaultScreen/XDefaultScreen
 
 XDefaultScreenOfDisplay
 	"VSW5TESTSUITE CASE XDefaultScreenOfDisplay 1"
-	/tset/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
+	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay
 
 XDefaultVisual
 	"VSW5TESTSUITE CASE XDefaultVisual 1"
-	/tset/Xlib3/XDefaultVisual/XDefaultVisual
+	/Xlib3/XDefaultVisual/XDefaultVisual
 
 XDefaultVisualOfScreen
 	"VSW5TESTSUITE CASE XDefaultVisualOfScreen 1"
-	/tset/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen
+	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen
 
 XDoesBackingStore
 	"VSW5TESTSUITE CASE XDoesBackingStore 1"
-	/tset/Xlib3/XDoesBackingStore/XDoesBackingStore
+	/Xlib3/XDoesBackingStore/XDoesBackingStore
 
 XDisplayCells
 	"VSW5TESTSUITE CASE XDisplayCells 1"
-	/tset/Xlib3/XDisplayCells/XDisplayCells
+	/Xlib3/XDisplayCells/XDisplayCells
 
 XDisplayHeight
 	"VSW5TESTSUITE CASE XDisplayHeight 1"
-	/tset/Xlib3/XDisplayHeight/XDisplayHeight
+	/Xlib3/XDisplayHeight/XDisplayHeight
 
 XDisplayHeightMM
 	"VSW5TESTSUITE CASE XDisplayHeightMM 1"
-	/tset/Xlib3/XDisplayHeightMM/XDisplayHeightMM
+	/Xlib3/XDisplayHeightMM/XDisplayHeightMM
 
 XDisplayOfScreen
 	"VSW5TESTSUITE CASE XDisplayOfScreen 1"
-	/tset/Xlib3/XDisplayOfScreen/XDisplayOfScreen
+	/Xlib3/XDisplayOfScreen/XDisplayOfScreen
 
 XDisplayPlanes
 	"VSW5TESTSUITE CASE XDisplayPlanes 1"
-	/tset/Xlib3/XDisplayPlanes/XDisplayPlanes
+	/Xlib3/XDisplayPlanes/XDisplayPlanes
 
 XDisplayString
 	"VSW5TESTSUITE CASE XDisplayString 2"
-	/tset/Xlib3/XDisplayString/XDisplayString
+	/Xlib3/XDisplayString/XDisplayString
 
 XDisplayWidth
 	"VSW5TESTSUITE CASE XDisplayWidth 1"
-	/tset/Xlib3/XDisplayWidth/XDisplayWidth
+	/Xlib3/XDisplayWidth/XDisplayWidth
 
 XDisplayWidthMM
 	"VSW5TESTSUITE CASE XDisplayWidthMM 1"
-	/tset/Xlib3/XDisplayWidthMM/XDisplayWidthMM
+	/Xlib3/XDisplayWidthMM/XDisplayWidthMM
 
 XDoesSaveUnders
 	"VSW5TESTSUITE CASE XDoesSaveUnders 1"
-	/tset/Xlib3/XDoesSaveUnders/XDoesSaveUnders
+	/Xlib3/XDoesSaveUnders/XDoesSaveUnders
 
 XEventMaskOfScreen
 	"VSW5TESTSUITE CASE XEventMaskOfScreen 1"
-	/tset/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen
+	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen
 
 XFree
 	"VSW5TESTSUITE CASE XFree 1"
-	/tset/Xlib3/XFree/XFree
+	/Xlib3/XFree/XFree
 
 XHeightMMOfScreen
 	"VSW5TESTSUITE CASE XHeightMMOfScreen 1"
-	/tset/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen
+	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen
 
 XHeightOfScreen
 	"VSW5TESTSUITE CASE XHeightOfScreen 1"
-	/tset/Xlib3/XHeightOfScreen/XHeightOfScreen
+	/Xlib3/XHeightOfScreen/XHeightOfScreen
 
 XImageByteOrder
 	"VSW5TESTSUITE CASE XImageByteOrder 1"
-	/tset/Xlib3/XImageByteOrder/XImageByteOrder
+	/Xlib3/XImageByteOrder/XImageByteOrder
 
 XListDepths
 	"VSW5TESTSUITE CASE XListDepths 3"
-	/tset/Xlib3/XListDepths/XListDepths
+	/Xlib3/XListDepths/XListDepths
 
 XLastKnownRequestProcessed
 	"VSW5TESTSUITE CASE XLastKnownRequestProcessed 1"
-	/tset/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed
+	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed
 
 XListPixmapFormats
 	"VSW5TESTSUITE CASE XListPixmapFormats 2"
-	/tset/Xlib3/XListPixmapFormats/XListPixmapFormats
+	/Xlib3/XListPixmapFormats/XListPixmapFormats
 
 XMinCmapsOfScreen
 	"VSW5TESTSUITE CASE XMinCmapsOfScreen 1"
-	/tset/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen
+	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen
 
 XMaxCmapsOfScreen
 	"VSW5TESTSUITE CASE XMaxCmapsOfScreen 1"
-	/tset/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen
+	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen
 
 XNoOp
 	"VSW5TESTSUITE CASE XNoOp 1"
-	/tset/Xlib3/XNoOp/XNoOp
+	/Xlib3/XNoOp/XNoOp
 
 XNextRequest
 	"VSW5TESTSUITE CASE XNextRequest 2"
-	/tset/Xlib3/XNextRequest/XNextRequest
+	/Xlib3/XNextRequest/XNextRequest
 
 XOpenDisplay
 	"VSW5TESTSUITE CASE XOpenDisplay 10"
-	/tset/Xlib3/XOpenDisplay/XOpenDisplay
+	/Xlib3/XOpenDisplay/XOpenDisplay
 
 XPlanesOfScreen
 	"VSW5TESTSUITE CASE XPlanesOfScreen 1"
-	/tset/Xlib3/XPlanesOfScreen/XPlanesOfScreen
+	/Xlib3/XPlanesOfScreen/XPlanesOfScreen
 
 XProtocolRevision
 	"VSW5TESTSUITE CASE XProtocolRevision 1"
-	/tset/Xlib3/XProtocolRevision/XProtocolRevision
+	/Xlib3/XProtocolRevision/XProtocolRevision
 
 XProtocolVersion
 	"VSW5TESTSUITE CASE XProtocolVersion 1"
-	/tset/Xlib3/XProtocolVersion/XProtocolVersion
+	/Xlib3/XProtocolVersion/XProtocolVersion
 
 XQLength
 	"VSW5TESTSUITE CASE XQLength 1"
-	/tset/Xlib3/XQLength/XQLength
+	/Xlib3/XQLength/XQLength
 
 XRootWindow
 	"VSW5TESTSUITE CASE XRootWindow 1"
-	/tset/Xlib3/XRootWindow/XRootWindow
+	/Xlib3/XRootWindow/XRootWindow
 
 XRootWindowOfScreen
 	"VSW5TESTSUITE CASE XRootWindowOfScreen 1"
-	/tset/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen
+	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen
 
 XScreenCount
 	"VSW5TESTSUITE CASE XScreenCount 1"
-	/tset/Xlib3/XScreenCount/XScreenCount
+	/Xlib3/XScreenCount/XScreenCount
 
 XScreenNumberOfScreen
 	"VSW5TESTSUITE CASE XScreenNumberOfScreen 1"
-	/tset/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen
+	/Xlib3/XScreenNumberOfScreen/XScreenNumberOfScreen
 
 XScreenOfDisplay
 	"VSW5TESTSUITE CASE XScreenOfDisplay 1"
-	/tset/Xlib3/XScreenOfDisplay/XScreenOfDisplay
+	/Xlib3/XScreenOfDisplay/XScreenOfDisplay
 
 XVendorRelease
 	"VSW5TESTSUITE CASE XVendorRelease 1"
-	/tset/Xlib3/XVendorRelease/XVendorRelease
+	/Xlib3/XVendorRelease/XVendorRelease
 
 XServerVendor
 	"VSW5TESTSUITE CASE XServerVendor 1"
-	/tset/Xlib3/XServerVendor/XServerVendor
+	/Xlib3/XServerVendor/XServerVendor
 
 XSetCloseDownMode
 	"VSW5TESTSUITE CASE XSetCloseDownMode 7"
-	/tset/Xlib3/XSetCloseDownMode/XSetCloseDownMode
+	/Xlib3/XSetCloseDownMode/XSetCloseDownMode
 
 XWidthMMOfScreen
 	"VSW5TESTSUITE CASE XWidthMMOfScreen 1"
-	/tset/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen
+	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen
 
 XWidthOfScreen
 	"VSW5TESTSUITE CASE XWidthOfScreen 1"
-	/tset/Xlib3/XWidthOfScreen/XWidthOfScreen
+	/Xlib3/XWidthOfScreen/XWidthOfScreen
 
 XWhitePixel
 	"VSW5TESTSUITE CASE XWhitePixel 1"
-	/tset/Xlib3/XWhitePixel/XWhitePixel
+	/Xlib3/XWhitePixel/XWhitePixel
 
 XWhitePixelOfScreen
 	"VSW5TESTSUITE CASE XWhitePixelOfScreen 1"
-	/tset/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen
+	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen
 
 BlackPixel
 	"VSW5TESTSUITE CASE BlackPixel 1"
-	/tset/Xlib3/XBlackPixel/XBlackPixel_m
+	/Xlib3/XBlackPixel/XBlackPixel_m
 
 BlackPixelOfScreen
 	"VSW5TESTSUITE CASE BlackPixelOfScreen 1"
-	/tset/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen_m
+	/Xlib3/XBlackPixelOfScreen/XBlackPixelOfScreen_m
 
 BitmapBitOrder
 	"VSW5TESTSUITE CASE BitmapBitOrder 1"
-	/tset/Xlib3/XBitmapBitOrder/XBitmapBitOrder_m
+	/Xlib3/XBitmapBitOrder/XBitmapBitOrder_m
 
 BitmapPad
 	"VSW5TESTSUITE CASE BitmapPad 1"
-	/tset/Xlib3/XBitmapPad/XBitmapPad_m
+	/Xlib3/XBitmapPad/XBitmapPad_m
 
 BitmapUnit
 	"VSW5TESTSUITE CASE BitmapUnit 1"
-	/tset/Xlib3/XBitmapUnit/XBitmapUnit_m
+	/Xlib3/XBitmapUnit/XBitmapUnit_m
 
 CellsOfScreen
 	"VSW5TESTSUITE CASE CellsOfScreen 1"
-	/tset/Xlib3/XCellsOfScreen/XCellsOfScreen_m
+	/Xlib3/XCellsOfScreen/XCellsOfScreen_m
 
 ConnectionNumber
 	"VSW5TESTSUITE CASE ConnectionNumber 1"
-	/tset/Xlib3/XConnectionNumber/XConnectionNumber_m
+	/Xlib3/XConnectionNumber/XConnectionNumber_m
 
 DefaultColormap
 	"VSW5TESTSUITE CASE DefaultColormap 1"
-	/tset/Xlib3/XDefaultColormap/XDefaultColormap_m
+	/Xlib3/XDefaultColormap/XDefaultColormap_m
 
 DefaultColormapOfScreen
 	"VSW5TESTSUITE CASE DefaultColormapOfScreen 1"
-	/tset/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
+	/Xlib3/XDefaultColormapOfScreen/XDefaultColormapOfScreen_m
 
 DefaultDepth
 	"VSW5TESTSUITE CASE DefaultDepth 1"
-	/tset/Xlib3/XDefaultDepth/XDefaultDepth_m
+	/Xlib3/XDefaultDepth/XDefaultDepth_m
 
 DefaultDepthOfScreen
 	"VSW5TESTSUITE CASE DefaultDepthOfScreen 1"
-	/tset/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
+	/Xlib3/XDefaultDepthOfScreen/XDefaultDepthOfScreen_m
 
 DefaultGC
 	"VSW5TESTSUITE CASE DefaultGC 1"
-	/tset/Xlib3/XDefaultGC/XDefaultGC_m
+	/Xlib3/XDefaultGC/XDefaultGC_m
 
 DefaultGCOfScreen
 	"VSW5TESTSUITE CASE DefaultGCOfScreen 2"
-	/tset/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen_m
+	/Xlib3/XDefaultGCOfScreen/XDefaultGCOfScreen_m
 
 DefaultRootWindow
 	"VSW5TESTSUITE CASE DefaultRootWindow 1"
-	/tset/Xlib3/XDefaultRootWindow/XDefaultRootWindow_m
+	/Xlib3/XDefaultRootWindow/XDefaultRootWindow_m
 
 DefaultScreen
 	"VSW5TESTSUITE CASE DefaultScreen 1"
-	/tset/Xlib3/XDefaultScreen/XDefaultScreen_m
+	/Xlib3/XDefaultScreen/XDefaultScreen_m
 
 DefaultScreenOfDisplay
 	"VSW5TESTSUITE CASE DefaultScreenOfDisplay 1"
-	/tset/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
+	/Xlib3/XDefaultScreenOfDisplay/XDefaultScreenOfDisplay_m
 
 DefaultVisual
 	"VSW5TESTSUITE CASE DefaultVisual 1"
-	/tset/Xlib3/XDefaultVisual/XDefaultVisual_m
+	/Xlib3/XDefaultVisual/XDefaultVisual_m
 
 DefaultVisualOfScreen
 	"VSW5TESTSUITE CASE DefaultVisualOfScreen 1"
-	/tset/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
+	/Xlib3/XDefaultVisualOfScreen/XDefaultVisualOfScreen_m
 
 DoesBackingStore
 	"VSW5TESTSUITE CASE DoesBackingStore 1"
-	/tset/Xlib3/XDoesBackingStore/XDoesBackingStore_m
+	/Xlib3/XDoesBackingStore/XDoesBackingStore_m
 
 DisplayCells
 	"VSW5TESTSUITE CASE DisplayCells 1"
-	/tset/Xlib3/XDisplayCells/XDisplayCells_m
+	/Xlib3/XDisplayCells/XDisplayCells_m
 
 DisplayHeight
 	"VSW5TESTSUITE CASE DisplayHeight 1"
-	/tset/Xlib3/XDisplayHeight/XDisplayHeight_m
+	/Xlib3/XDisplayHeight/XDisplayHeight_m
 
 DisplayHeightMM
 	"VSW5TESTSUITE CASE DisplayHeightMM 1"
-	/tset/Xlib3/XDisplayHeightMM/XDisplayHeightMM_m
+	/Xlib3/XDisplayHeightMM/XDisplayHeightMM_m
 
 DisplayOfScreen
 	"VSW5TESTSUITE CASE DisplayOfScreen 1"
-	/tset/Xlib3/XDisplayOfScreen/XDisplayOfScreen_m
+	/Xlib3/XDisplayOfScreen/XDisplayOfScreen_m
 
 DisplayPlanes
 	"VSW5TESTSUITE CASE DisplayPlanes 1"
-	/tset/Xlib3/XDisplayPlanes/XDisplayPlanes_m
+	/Xlib3/XDisplayPlanes/XDisplayPlanes_m
 
 DisplayString
 	"VSW5TESTSUITE CASE DisplayString 2"
-	/tset/Xlib3/XDisplayString/XDisplayString_m
+	/Xlib3/XDisplayString/XDisplayString_m
 
 DisplayWidth
 	"VSW5TESTSUITE CASE DisplayWidth 1"
-	/tset/Xlib3/XDisplayWidth/XDisplayWidth_m
+	/Xlib3/XDisplayWidth/XDisplayWidth_m
 
 DisplayWidthMM
 	"VSW5TESTSUITE CASE DisplayWidthMM 1"
-	/tset/Xlib3/XDisplayWidthMM/XDisplayWidthMM_m
+	/Xlib3/XDisplayWidthMM/XDisplayWidthMM_m
 
 DoesSaveUnders
 	"VSW5TESTSUITE CASE DoesSaveUnders 1"
-	/tset/Xlib3/XDoesSaveUnders/XDoesSaveUnders_m
+	/Xlib3/XDoesSaveUnders/XDoesSaveUnders_m
 
 EventMaskOfScreen
 	"VSW5TESTSUITE CASE EventMaskOfScreen 1"
-	/tset/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen_m
+	/Xlib3/XEventMaskOfScreen/XEventMaskOfScreen_m
 
 HeightMMOfScreen
 	"VSW5TESTSUITE CASE HeightMMOfScreen 1"
-	/tset/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen_m
+	/Xlib3/XHeightMMOfScreen/XHeightMMOfScreen_m
 
 HeightOfScreen
 	"VSW5TESTSUITE CASE HeightOfScreen 1"
-	/tset/Xlib3/XHeightOfScreen/XHeightOfScreen_m
+	/Xlib3/XHeightOfScreen/XHeightOfScreen_m
 
 ImageByteOrder
 	"VSW5TESTSUITE CASE ImageByteOrder 1"
-	/tset/Xlib3/XImageByteOrder/XImageByteOrder_m
+	/Xlib3/XImageByteOrder/XImageByteOrder_m
 
 LastKnownRequestProcessed
 	"VSW5TESTSUITE CASE LastKnownRequestProcessed 1"
-	/tset/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
+	/Xlib3/XLastKnownRequestProcessed/XLastKnownRequestProcessed_m
 
 MinCmapsOfScreen
 	"VSW5TESTSUITE CASE MinCmapsOfScreen 1"
-	/tset/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen_m
+	/Xlib3/XMinCmapsOfScreen/XMinCmapsOfScreen_m
 
 MaxCmapsOfScreen
 	"VSW5TESTSUITE CASE MaxCmapsOfScreen 1"
-	/tset/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
+	/Xlib3/XMaxCmapsOfScreen/XMaxCmapsOfScreen_m
 
 NextRequest
 	"VSW5TESTSUITE CASE NextRequest 2"
-	/tset/Xlib3/XNextRequest/XNextRequest_m
+	/Xlib3/XNextRequest/XNextRequest_m
 
 PlanesOfScreen
 	"VSW5TESTSUITE CASE PlanesOfScreen 1"
-	/tset/Xlib3/XPlanesOfScreen/XPlanesOfScreen_m
+	/Xlib3/XPlanesOfScreen/XPlanesOfScreen_m
 
 ProtocolRevision
 	"VSW5TESTSUITE CASE ProtocolRevision 1"
-	/tset/Xlib3/XProtocolRevision/XProtocolRevision_m
+	/Xlib3/XProtocolRevision/XProtocolRevision_m
 
 ProtocolVersion
 	"VSW5TESTSUITE CASE ProtocolVersion 1"
-	/tset/Xlib3/XProtocolVersion/XProtocolVersion_m
+	/Xlib3/XProtocolVersion/XProtocolVersion_m
 
 QLength
 	"VSW5TESTSUITE CASE QLength 1"
-	/tset/Xlib3/XQLength/XQLength_m
+	/Xlib3/XQLength/XQLength_m
 
 RootWindow
 	"VSW5TESTSUITE CASE RootWindow 1"
-	/tset/Xlib3/XRootWindow/XRootWindow_m
+	/Xlib3/XRootWindow/XRootWindow_m
 
 RootWindowOfScreen
 	"VSW5TESTSUITE CASE RootWindowOfScreen 1"
-	/tset/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen_m
+	/Xlib3/XRootWindowOfScreen/XRootWindowOfScreen_m
 
 ScreenCount
 	"VSW5TESTSUITE CASE ScreenCount 1"
-	/tset/Xlib3/XScreenCount/XScreenCount_m
+	/Xlib3/XScreenCount/XScreenCount_m
 
 ScreenOfDisplay
 	"VSW5TESTSUITE CASE ScreenOfDisplay 1"
-	/tset/Xlib3/XScreenOfDisplay/XScreenOfDisplay_m
+	/Xlib3/XScreenOfDisplay/XScreenOfDisplay_m
 
 VendorRelease
 	"VSW5TESTSUITE CASE VendorRelease 1"
-	/tset/Xlib3/XVendorRelease/XVendorRelease_m
+	/Xlib3/XVendorRelease/XVendorRelease_m
 
 ServerVendor
 	"VSW5TESTSUITE CASE ServerVendor 1"
-	/tset/Xlib3/XServerVendor/XServerVendor_m
+	/Xlib3/XServerVendor/XServerVendor_m
 
 WidthMMOfScreen
 	"VSW5TESTSUITE CASE WidthMMOfScreen 1"
-	/tset/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen_m
+	/Xlib3/XWidthMMOfScreen/XWidthMMOfScreen_m
 
 WidthOfScreen
 	"VSW5TESTSUITE CASE WidthOfScreen 1"
-	/tset/Xlib3/XWidthOfScreen/XWidthOfScreen_m
+	/Xlib3/XWidthOfScreen/XWidthOfScreen_m
 
 WhitePixel
 	"VSW5TESTSUITE CASE WhitePixel 1"
-	/tset/Xlib3/XWhitePixel/XWhitePixel_m
+	/Xlib3/XWhitePixel/XWhitePixel_m
 
 WhitePixelOfScreen
 	"VSW5TESTSUITE CASE WhitePixelOfScreen 1"
-	/tset/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen_m
+	/Xlib3/XWhitePixelOfScreen/XWhitePixelOfScreen_m
 
 
 # Discrete tests for Xlib Chapter 4-Window Functions
 
 XChangeWindowAttributes
 	"VSW5TESTSUITE CASE XChangeWindowAttributes 46"
-	/tset/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes
+	/Xlib4/XChangeWindowAttributes/XChangeWindowAttributes
 
 XConfigureWindow
 	"VSW5TESTSUITE CASE XConfigureWindow 34"
-	/tset/Xlib4/XConfigureWindow/XConfigureWindow
+	/Xlib4/XConfigureWindow/XConfigureWindow
 
 XCirculateSubwindows
 	"VSW5TESTSUITE CASE XCirculateSubwindows 7"
-	/tset/Xlib4/XCirculateSubwindows/XCirculateSubwindows
+	/Xlib4/XCirculateSubwindows/XCirculateSubwindows
 
 XCirculateSubwindowsDown
 	"VSW5TESTSUITE CASE XCirculateSubwindowsDown 5"
-	/tset/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown
+	/Xlib4/XCirculateSubwindowsDown/XCirculateSubwindowsDown
 
 XCirculateSubwindowsUp
 	"VSW5TESTSUITE CASE XCirculateSubwindowsUp 5"
-	/tset/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp
+	/Xlib4/XCirculateSubwindowsUp/XCirculateSubwindowsUp
 
 XCreateSimpleWindow
 	"VSW5TESTSUITE CASE XCreateSimpleWindow 12"
-	/tset/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow
+	/Xlib4/XCreateSimpleWindow/XCreateSimpleWindow
 
 XCreateWindow
 	"VSW5TESTSUITE CASE XCreateWindow 49"
-	/tset/Xlib4/XCreateWindow/XCreateWindow
+	/Xlib4/XCreateWindow/XCreateWindow
 
 XDefineCursor
 	"VSW5TESTSUITE CASE XDefineCursor 6"
-	/tset/Xlib4/XDefineCursor/XDefineCursor
+	/Xlib4/XDefineCursor/XDefineCursor
 
 XDestroySubwindows
 	"VSW5TESTSUITE CASE XDestroySubwindows 5"
-	/tset/Xlib4/XDestroySubwindows/XDestroySubwindows
+	/Xlib4/XDestroySubwindows/XDestroySubwindows
 
 XDestroyWindow
 	"VSW5TESTSUITE CASE XDestroyWindow 6"
-	/tset/Xlib4/XDestroyWindow/XDestroyWindow
+	/Xlib4/XDestroyWindow/XDestroyWindow
 
 XLowerWindow
 	"VSW5TESTSUITE CASE XLowerWindow 4"
-	/tset/Xlib4/XLowerWindow/XLowerWindow
+	/Xlib4/XLowerWindow/XLowerWindow
 
 XMapRaised
 	"VSW5TESTSUITE CASE XMapRaised 15"
-	/tset/Xlib4/XMapRaised/XMapRaised
+	/Xlib4/XMapRaised/XMapRaised
 
 XMapSubwindows
 	"VSW5TESTSUITE CASE XMapSubwindows 14"
-	/tset/Xlib4/XMapSubwindows/XMapSubwindows
+	/Xlib4/XMapSubwindows/XMapSubwindows
 
 XMapWindow
 	"VSW5TESTSUITE CASE XMapWindow 15"
-	/tset/Xlib4/XMapWindow/XMapWindow
+	/Xlib4/XMapWindow/XMapWindow
 
 XMoveResizeWindow
 	"VSW5TESTSUITE CASE XMoveResizeWindow 15"
-	/tset/Xlib4/XMoveResizeWindow/XMoveResizeWindow
+	/Xlib4/XMoveResizeWindow/XMoveResizeWindow
 
 XMoveWindow
 	"VSW5TESTSUITE CASE XMoveWindow 8"
-	/tset/Xlib4/XMoveWindow/XMoveWindow
+	/Xlib4/XMoveWindow/XMoveWindow
 
 XRestackWindows
 	"VSW5TESTSUITE CASE XRestackWindows 6"
-	/tset/Xlib4/XRestackWindows/XRestackWindows
+	/Xlib4/XRestackWindows/XRestackWindows
 
 XRaiseWindow
 	"VSW5TESTSUITE CASE XRaiseWindow 4"
-	/tset/Xlib4/XRaiseWindow/XRaiseWindow
+	/Xlib4/XRaiseWindow/XRaiseWindow
 
 XResizeWindow
 	"VSW5TESTSUITE CASE XResizeWindow 13"
-	/tset/Xlib4/XResizeWindow/XResizeWindow
+	/Xlib4/XResizeWindow/XResizeWindow
 
 XSetWindowBackground
 	"VSW5TESTSUITE CASE XSetWindowBackground 4"
-	/tset/Xlib4/XSetWindowBackground/XSetWindowBackground
+	/Xlib4/XSetWindowBackground/XSetWindowBackground
 
 XSetWindowBackgroundPixmap
 	"VSW5TESTSUITE CASE XSetWindowBackgroundPixmap 11"
-	/tset/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap
+	/Xlib4/XSetWindowBackgroundPixmap/XSetWindowBackgroundPixmap
 
 XSetWindowBorder
 	"VSW5TESTSUITE CASE XSetWindowBorder 5"
-	/tset/Xlib4/XSetWindowBorder/XSetWindowBorder
+	/Xlib4/XSetWindowBorder/XSetWindowBorder
 
 XSetWindowBorderPixmap
 	"VSW5TESTSUITE CASE XSetWindowBorderPixmap 9"
-	/tset/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap
+	/Xlib4/XSetWindowBorderPixmap/XSetWindowBorderPixmap
 
 XSetWindowBorderWidth
 	"VSW5TESTSUITE CASE XSetWindowBorderWidth 7"
-	/tset/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth
+	/Xlib4/XSetWindowBorderWidth/XSetWindowBorderWidth
 
 XSetWindowColormap
 	"VSW5TESTSUITE CASE XSetWindowColormap 4"
-	/tset/Xlib4/XSetWindowColormap/XSetWindowColormap
+	/Xlib4/XSetWindowColormap/XSetWindowColormap
 
 XUndefineCursor
 	"VSW5TESTSUITE CASE XUndefineCursor 3"
-	/tset/Xlib4/XUndefineCursor/XUndefineCursor
+	/Xlib4/XUndefineCursor/XUndefineCursor
 
 XUnmapSubwindows
 	"VSW5TESTSUITE CASE XUnmapSubwindows 5"
-	/tset/Xlib4/XUnmapSubwindows/XUnmapSubwindows
+	/Xlib4/XUnmapSubwindows/XUnmapSubwindows
 
 XUnmapWindow
 	"VSW5TESTSUITE CASE XUnmapWindow 6"
-	/tset/Xlib4/XUnmapWindow/XUnmapWindow
+	/Xlib4/XUnmapWindow/XUnmapWindow
 
 XVisualIDFromVisual
 	"VSW5TESTSUITE CASE XVisualIDFromVisual 1"
-	/tset/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual
+	/Xlib4/XVisualIDFromVisual/XVisualIDFromVisual
 
 
 # Discrete tests for Xlib Chapter 5-Window Information Functions
 
 XChangeProperty
 	"VSW5TESTSUITE CASE XChangeProperty 13"
-	/tset/Xlib5/XChangeProperty/XChangeProperty
+	/Xlib5/XChangeProperty/XChangeProperty
 
 XConvertSelection
 	"VSW5TESTSUITE CASE XConvertSelection 5"
-	/tset/Xlib5/XConvertSelection/XConvertSelection
+	/Xlib5/XConvertSelection/XConvertSelection
 
 XDeleteProperty
 	"VSW5TESTSUITE CASE XDeleteProperty 4"
-	/tset/Xlib5/XDeleteProperty/XDeleteProperty
+	/Xlib5/XDeleteProperty/XDeleteProperty
 
 XGetAtomName
 	"VSW5TESTSUITE CASE XGetAtomName 2"
-	/tset/Xlib5/XGetAtomName/XGetAtomName
+	/Xlib5/XGetAtomName/XGetAtomName
 
 XGetGeometry
 	"VSW5TESTSUITE CASE XGetGeometry 4"
-	/tset/Xlib5/XGetGeometry/XGetGeometry
+	/Xlib5/XGetGeometry/XGetGeometry
 
 XGetSelectionOwner
 	"VSW5TESTSUITE CASE XGetSelectionOwner 3"
-	/tset/Xlib5/XGetSelectionOwner/XGetSelectionOwner
+	/Xlib5/XGetSelectionOwner/XGetSelectionOwner
 
 XGetWindowAttributes
 	"VSW5TESTSUITE CASE XGetWindowAttributes 3"
-	/tset/Xlib5/XGetWindowAttributes/XGetWindowAttributes
+	/Xlib5/XGetWindowAttributes/XGetWindowAttributes
 
 XGetWindowProperty
 	"VSW5TESTSUITE CASE XGetWindowProperty 10"
-	/tset/Xlib5/XGetWindowProperty/XGetWindowProperty
+	/Xlib5/XGetWindowProperty/XGetWindowProperty
 
 XInternAtom
 	"VSW5TESTSUITE CASE XInternAtom 8"
-	/tset/Xlib5/XInternAtom/XInternAtom
+	/Xlib5/XInternAtom/XInternAtom
 
 XListProperties
 	"VSW5TESTSUITE CASE XListProperties 3"
-	/tset/Xlib5/XListProperties/XListProperties
+	/Xlib5/XListProperties/XListProperties
 
 XQueryPointer
 	"VSW5TESTSUITE CASE XQueryPointer 6"
-	/tset/Xlib5/XQueryPointer/XQueryPointer
+	/Xlib5/XQueryPointer/XQueryPointer
 
 XQueryTree
 	"VSW5TESTSUITE CASE XQueryTree 3"
-	/tset/Xlib5/XQueryTree/XQueryTree
+	/Xlib5/XQueryTree/XQueryTree
 
 XRotateWindowProperties
 	"VSW5TESTSUITE CASE XRotateWindowProperties 6"
-	/tset/Xlib5/XRotateWindowProperties/XRotateWindowProperties
+	/Xlib5/XRotateWindowProperties/XRotateWindowProperties
 
 XSetSelectionOwner
 	"VSW5TESTSUITE CASE XSetSelectionOwner 9"
-	/tset/Xlib5/XSetSelectionOwner/XSetSelectionOwner
+	/Xlib5/XSetSelectionOwner/XSetSelectionOwner
 
 XTranslateCoordinates
 	"VSW5TESTSUITE CASE XTranslateCoordinates 5"
-	/tset/Xlib5/XTranslateCoordinates/XTranslateCoordinates
+	/Xlib5/XTranslateCoordinates/XTranslateCoordinates
 
 
 # Discrete tests for Xlib Chapter 6-Pixmap and Cursor Functions
 
 XCreatePixmap
 	"VSW5TESTSUITE CASE XCreatePixmap 6"
-	/tset/Xlib6/XCreatePixmap/XCreatePixmap
+	/Xlib6/XCreatePixmap/XCreatePixmap
 
 XCreateFontCursor
 	"VSW5TESTSUITE CASE XCreateFontCursor 3"
-	/tset/Xlib6/XCreateFontCursor/XCreateFontCursor
+	/Xlib6/XCreateFontCursor/XCreateFontCursor
 
 XCreateGlyphCursor
 	"VSW5TESTSUITE CASE XCreateGlyphCursor 17"
-	/tset/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor
+	/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor
 
 XCreatePixmapCursor
 	"VSW5TESTSUITE CASE XCreatePixmapCursor 13"
-	/tset/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor
+	/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor
 
 XFreeCursor
 	"VSW5TESTSUITE CASE XFreeCursor 3"
-	/tset/Xlib6/XFreeCursor/XFreeCursor
+	/Xlib6/XFreeCursor/XFreeCursor
 
 XFreePixmap
 	"VSW5TESTSUITE CASE XFreePixmap 3"
-	/tset/Xlib6/XFreePixmap/XFreePixmap
+	/Xlib6/XFreePixmap/XFreePixmap
 
 XQueryBestCursor
 	"VSW5TESTSUITE CASE XQueryBestCursor 2"
-	/tset/Xlib6/XQueryBestCursor/XQueryBestCursor
+	/Xlib6/XQueryBestCursor/XQueryBestCursor
 
 XRecolorCursor
 	"VSW5TESTSUITE CASE XRecolorCursor 3"
-	/tset/Xlib6/XRecolorCursor/XRecolorCursor
+	/Xlib6/XRecolorCursor/XRecolorCursor
 
 
 # Discrete tests for Xlib Chapter 7-Color Management Functions
 
 XAllocColor
 	"VSW5TESTSUITE CASE XAllocColor 5"
-	/tset/Xlib7/XAllocColor/XAllocColor
+	/Xlib7/XAllocColor/XAllocColor
 
 XAllocColorCells
 	"VSW5TESTSUITE CASE XAllocColorCells 9"
-	/tset/Xlib7/XAllocColorCells/XAllocColorCells
+	/Xlib7/XAllocColorCells/XAllocColorCells
 
 XAllocColorPlanes
 	"VSW5TESTSUITE CASE XAllocColorPlanes 7"
-	/tset/Xlib7/XAllocColorPlanes/XAllocColorPlanes
+	/Xlib7/XAllocColorPlanes/XAllocColorPlanes
 
 XAllocNamedColor
 	"VSW5TESTSUITE CASE XAllocNamedColor 6"
-	/tset/Xlib7/XAllocNamedColor/XAllocNamedColor
+	/Xlib7/XAllocNamedColor/XAllocNamedColor
 
 XCopyColormapAndFree
 	"VSW5TESTSUITE CASE XCopyColormapAndFree 5"
-	/tset/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree
+	/Xlib7/XCopyColormapAndFree/XCopyColormapAndFree
 
 XCreateColormap
 	"VSW5TESTSUITE CASE XCreateColormap 13"
-	/tset/Xlib7/XCreateColormap/XCreateColormap
+	/Xlib7/XCreateColormap/XCreateColormap
 
 XFreeColormap
 	"VSW5TESTSUITE CASE XFreeColormap 5"
-	/tset/Xlib7/XFreeColormap/XFreeColormap
+	/Xlib7/XFreeColormap/XFreeColormap
 
 XFreeColors
 	"VSW5TESTSUITE CASE XFreeColors 9"
-	/tset/Xlib7/XFreeColors/XFreeColors
+	/Xlib7/XFreeColors/XFreeColors
 
 XLookupColor
 	"VSW5TESTSUITE CASE XLookupColor 4"
-	/tset/Xlib7/XLookupColor/XLookupColor
+	/Xlib7/XLookupColor/XLookupColor
 
 XParseColor
 	"VSW5TESTSUITE CASE XParseColor 10"
-	/tset/Xlib7/XParseColor/XParseColor
+	/Xlib7/XParseColor/XParseColor
 
 XQueryColor
 	"VSW5TESTSUITE CASE XQueryColor 3"
-	/tset/Xlib7/XQueryColor/XQueryColor
+	/Xlib7/XQueryColor/XQueryColor
 
 XQueryColors
 	"VSW5TESTSUITE CASE XQueryColors 3"
-	/tset/Xlib7/XQueryColors/XQueryColors
+	/Xlib7/XQueryColors/XQueryColors
 
 XStoreColor
 	"VSW5TESTSUITE CASE XStoreColor 8"
-	/tset/Xlib7/XStoreColor/XStoreColor
+	/Xlib7/XStoreColor/XStoreColor
 
 XStoreColors
 	"VSW5TESTSUITE CASE XStoreColors 9"
-	/tset/Xlib7/XStoreColors/XStoreColors
+	/Xlib7/XStoreColors/XStoreColors
 
 XStoreNamedColor
 	"VSW5TESTSUITE CASE XStoreNamedColor 9"
-	/tset/Xlib7/XStoreNamedColor/XStoreNamedColor
+	/Xlib7/XStoreNamedColor/XStoreNamedColor
 
 XcmsAllocColor
 	"VSW5TESTSUITE CASE XcmsAllocColor 2"
-	/tset/Xlib7/XcmsAllocColor/XcmsAllocColor
+	/Xlib7/XcmsAllocColor/XcmsAllocColor
 
 XcmsAddColorSpace
 	"VSW5TESTSUITE CASE XcmsAddColorSpace 1"
-	/tset/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace
+	/Xlib7/XcmsAddColorSpace/XcmsAddColorSpace
 
 XcmsAddFunctionSet
 	"VSW5TESTSUITE CASE XcmsAddFunctionSet 1"
-	/tset/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet
+	/Xlib7/XcmsAddFunctionSet/XcmsAddFunctionSet
 
 XcmsAllocNamedColor
 	"VSW5TESTSUITE CASE XcmsAllocNamedColor 2"
-	/tset/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor
+	/Xlib7/XcmsAllocNamedColor/XcmsAllocNamedColor
 
 XcmsCCCOfColormap
 	"VSW5TESTSUITE CASE XcmsCCCOfColormap 1"
-	/tset/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap
+	/Xlib7/XcmsCCCOfColormap/XcmsCCCOfColormap
 
 XcmsConvertColors
 	"VSW5TESTSUITE CASE XcmsConvertColors 1"
-	/tset/Xlib7/XcmsConvertColors/XcmsConvertColors
+	/Xlib7/XcmsConvertColors/XcmsConvertColors
 
 XcmsCIELabQueryMaxLC
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMaxLC 1"
-	/tset/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC
+	/Xlib7/XcmsCIELabQueryMaxLC/XcmsCIELabQueryMaxLC
 
 XcmsCIELabQueryMaxC
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMaxC 1"
-	/tset/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC
+	/Xlib7/XcmsCIELabQueryMaxC/XcmsCIELabQueryMaxC
 
 XcmsCIELabQueryMaxL
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMaxL 1"
-	/tset/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL
+	/Xlib7/XcmsCIELabQueryMaxL/XcmsCIELabQueryMaxL
 
 XcmsConversionProc
 	"VSW5TESTSUITE CASE XcmsConversionProc 9"
-	/tset/Xlib7/XcmsConversionProc/XcmsConversionProc
+	/Xlib7/XcmsConversionProc/XcmsConversionProc
 
 XcmsConversionProc2
 	"VSW5TESTSUITE CASE XcmsConversionProc 4"
-	/tset/Xlib7/XcmsConversionProc/XcmsConversionProc
+	/Xlib7/XcmsConversionProc/XcmsConversionProc
 
 XcmsCreateCCC
 	"VSW5TESTSUITE CASE XcmsCreateCCC 1"
-	/tset/Xlib7/XcmsCreateCCC/XcmsCreateCCC
+	/Xlib7/XcmsCreateCCC/XcmsCreateCCC
 
 XcmsDefaultCCC
 	"VSW5TESTSUITE CASE XcmsDefaultCCC 1"
-	/tset/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC
+	/Xlib7/XcmsDefaultCCC/XcmsDefaultCCC
 
 XcmsDisplayOfCCC
 	"VSW5TESTSUITE CASE XcmsDisplayOfCCC 1"
-	/tset/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC
+	/Xlib7/XcmsDisplayOfCCC/XcmsDisplayOfCCC
 
 XcmsFreeCCC
 	"VSW5TESTSUITE CASE XcmsFreeCCC 1"
-	/tset/Xlib7/XcmsFreeCCC/XcmsFreeCCC
+	/Xlib7/XcmsFreeCCC/XcmsFreeCCC
 
 XcmsFormatOfPrefix
 	"VSW5TESTSUITE CASE XcmsFormatOfPrefix 2"
-	/tset/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix
+	/Xlib7/XcmsFormatOfPrefix/XcmsFormatOfPrefix
 
 XcmsLookupColor
 	"VSW5TESTSUITE CASE XcmsLookupColor 1"
-	/tset/Xlib7/XcmsLookupColor/XcmsLookupColor
+	/Xlib7/XcmsLookupColor/XcmsLookupColor
 
 XcmsCIELabQueryMinL
 	"VSW5TESTSUITE CASE XcmsCIELabQueryMinL 1"
-	/tset/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL
+	/Xlib7/XcmsCIELabQueryMinL/XcmsCIELabQueryMinL
 
 XcmsPrefixOfFormat
 	"VSW5TESTSUITE CASE XcmsPrefixOfFormat 1"
-	/tset/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat
+	/Xlib7/XcmsPrefixOfFormat/XcmsPrefixOfFormat
 
 XcmsQueryBlack
 	"VSW5TESTSUITE CASE XcmsQueryBlack 1"
-	/tset/Xlib7/XcmsQueryBlack/XcmsQueryBlack
+	/Xlib7/XcmsQueryBlack/XcmsQueryBlack
 
 XcmsQueryBlue
 	"VSW5TESTSUITE CASE XcmsQueryBlue 1"
-	/tset/Xlib7/XcmsQueryBlue/XcmsQueryBlue
+	/Xlib7/XcmsQueryBlue/XcmsQueryBlue
 
 XcmsQueryColor
 	"VSW5TESTSUITE CASE XcmsQueryColor 1"
-	/tset/Xlib7/XcmsQueryColor/XcmsQueryColor
+	/Xlib7/XcmsQueryColor/XcmsQueryColor
 
 XcmsQueryColors
 	"VSW5TESTSUITE CASE XcmsQueryColors 3"
-	/tset/Xlib7/XcmsQueryColors/XcmsQueryColors
+	/Xlib7/XcmsQueryColors/XcmsQueryColors
 
 XcmsQueryGreen
 	"VSW5TESTSUITE CASE XcmsQueryGreen 1"
-	/tset/Xlib7/XcmsQueryGreen/XcmsQueryGreen
+	/Xlib7/XcmsQueryGreen/XcmsQueryGreen
 
 XcmsCIELuvQueryMaxC
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMaxC 1"
-	/tset/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC
+	/Xlib7/XcmsCIELuvQueryMaxC/XcmsCIELuvQueryMaxC
 
 XcmsCIELuvQueryMinL
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMinL 1"
-	/tset/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL
+	/Xlib7/XcmsCIELuvQueryMinL/XcmsCIELuvQueryMinL
 
 XcmsCIELuvQueryMaxL
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMaxL 1"
-	/tset/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL
+	/Xlib7/XcmsCIELuvQueryMaxL/XcmsCIELuvQueryMaxL
 
 XcmsCIELuvQueryMaxLC
 	"VSW5TESTSUITE CASE XcmsCIELuvQueryMaxLC 1"
-	/tset/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC
+	/Xlib7/XcmsCIELuvQueryMaxLC/XcmsCIELuvQueryMaxLC
 
 XcmsQueryRed
 	"VSW5TESTSUITE CASE XcmsQueryRed 1"
-	/tset/Xlib7/XcmsQueryRed/XcmsQueryRed
+	/Xlib7/XcmsQueryRed/XcmsQueryRed
 
 XcmsQueryWhite
 	"VSW5TESTSUITE CASE XcmsQueryWhite 1"
-	/tset/Xlib7/XcmsQueryWhite/XcmsQueryWhite
+	/Xlib7/XcmsQueryWhite/XcmsQueryWhite
 
 XcmsScreenNumberOfCCC
 	"VSW5TESTSUITE CASE XcmsScreenNumberOfCCC 1"
-	/tset/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC
+	/Xlib7/XcmsScreenNumberOfCCC/XcmsScreenNumberOfCCC
 
 XcmsStoreColor
 	"VSW5TESTSUITE CASE XcmsStoreColor 4"
-	/tset/Xlib7/XcmsStoreColor/XcmsStoreColor
+	/Xlib7/XcmsStoreColor/XcmsStoreColor
 
 XcmsStoreColors
 	"VSW5TESTSUITE CASE XcmsStoreColors 4"
-	/tset/Xlib7/XcmsStoreColors/XcmsStoreColors
+	/Xlib7/XcmsStoreColors/XcmsStoreColors
 
 XcmsTekHVCQueryMaxC
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxC 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC
+	/Xlib7/XcmsTekHVCQueryMaxC/XcmsTekHVCQueryMaxC
 
 XcmsTekHVCQueryMinV
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMinV 1"
-	/tset/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV
+	/Xlib7/XcmsTekHVCQueryMinV/XcmsTekHVCQueryMinV
 
 XcmsTekHVCQueryMaxV
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxV 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV
+	/Xlib7/XcmsTekHVCQueryMaxV/XcmsTekHVCQueryMaxV
 
 XcmsTekHVCQueryMaxVC
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxVC 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC
+	/Xlib7/XcmsTekHVCQueryMaxVC/XcmsTekHVCQueryMaxVC
 
 XcmsTekHVCQueryMaxVSamples
 	"VSW5TESTSUITE CASE XcmsTekHVCQueryMaxVSamples 1"
-	/tset/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples
+	/Xlib7/XcmsTekHVCQueryMaxVSamples/XcmsTekHVCQueryMaxVSamples
 
 XcmsVisualOfCCC
 	"VSW5TESTSUITE CASE XcmsVisualOfCCC 1"
-	/tset/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC
+	/Xlib7/XcmsVisualOfCCC/XcmsVisualOfCCC
 
 XcmsSetWhiteAdjustProc
 	"VSW5TESTSUITE CASE XcmsSetWhiteAdjustProc 3"
-	/tset/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc
+	/Xlib7/XcmsSetWhiteAdjustProc/XcmsSetWhiteAdjustProc
 
 XcmsScreenWhitePointOfCCC
 	"VSW5TESTSUITE CASE XcmsScreenWhitePointOfCCC 1"
-	/tset/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC
+	/Xlib7/XcmsScreenWhitePointOfCCC/XcmsScreenWhitePointOfCCC
 
 XcmsClientWhitePointOfCCC
 	"VSW5TESTSUITE CASE XcmsClientWhitePointOfCCC 1"
-	/tset/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC
+	/Xlib7/XcmsClientWhitePointOfCCC/XcmsClientWhitePointOfCCC
 
 XcmsSetWhitePoint
 	"VSW5TESTSUITE CASE XcmsSetWhitePoint 1"
-	/tset/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint
+	/Xlib7/XcmsSetWhitePoint/XcmsSetWhitePoint
 
 # Discrete tests for Xlib Chapter 8-Graphics Context Functions
 
 XChangeGC
 	"VSW5TESTSUITE CASE XChangeGC 25"
-	/tset/Xlib8/XChangeGC/XChangeGC
+	/Xlib8/XChangeGC/XChangeGC
 
 XCopyGC
 	"VSW5TESTSUITE CASE XCopyGC 5"
-	/tset/Xlib8/XCopyGC/XCopyGC
+	/Xlib8/XCopyGC/XCopyGC
 
 XCreateGC
 	"VSW5TESTSUITE CASE XCreateGC 26"
-	/tset/Xlib8/XCreateGC/XCreateGC
+	/Xlib8/XCreateGC/XCreateGC
 
 XFreeGC
 	"VSW5TESTSUITE CASE XFreeGC 2"
-	/tset/Xlib8/XFreeGC/XFreeGC
+	/Xlib8/XFreeGC/XFreeGC
 
 XGContextFromGC
 	"VSW5TESTSUITE CASE XGContextFromGC 1"
-	/tset/Xlib8/XGContextFromGC/XGContextFromGC
+	/Xlib8/XGContextFromGC/XGContextFromGC
 
 XGetGCValues
 	"VSW5TESTSUITE CASE XGetGCValues 3"
-	/tset/Xlib8/XGetGCValues/XGetGCValues
+	/Xlib8/XGetGCValues/XGetGCValues
 
 XQueryBestStipple
 	"VSW5TESTSUITE CASE XQueryBestStipple 3"
-	/tset/Xlib8/XQueryBestStipple/XQueryBestStipple
+	/Xlib8/XQueryBestStipple/XQueryBestStipple
 
 XQueryBestSize
 	"VSW5TESTSUITE CASE XQueryBestSize 7"
-	/tset/Xlib8/XQueryBestSize/XQueryBestSize
+	/Xlib8/XQueryBestSize/XQueryBestSize
 
 XQueryBestTile
 	"VSW5TESTSUITE CASE XQueryBestTile 3"
-	/tset/Xlib8/XQueryBestTile/XQueryBestTile
+	/Xlib8/XQueryBestTile/XQueryBestTile
 
 XSetArcMode
 	"VSW5TESTSUITE CASE XSetArcMode 4"
-	/tset/Xlib8/XSetArcMode/XSetArcMode
+	/Xlib8/XSetArcMode/XSetArcMode
 
 XSetBackground
 	"VSW5TESTSUITE CASE XSetBackground 3"
-	/tset/Xlib8/XSetBackground/XSetBackground
+	/Xlib8/XSetBackground/XSetBackground
 
 XSetClipMask
 	"VSW5TESTSUITE CASE XSetClipMask 7"
-	/tset/Xlib8/XSetClipMask/XSetClipMask
+	/Xlib8/XSetClipMask/XSetClipMask
 
 XSetClipOrigin
 	"VSW5TESTSUITE CASE XSetClipOrigin 3"
-	/tset/Xlib8/XSetClipOrigin/XSetClipOrigin
+	/Xlib8/XSetClipOrigin/XSetClipOrigin
 
 XSetClipRectangles
 	"VSW5TESTSUITE CASE XSetClipRectangles 9"
-	/tset/Xlib8/XSetClipRectangles/XSetClipRectangles
+	/Xlib8/XSetClipRectangles/XSetClipRectangles
 
 XSetDashes
 	"VSW5TESTSUITE CASE XSetDashes 7"
-	/tset/Xlib8/XSetDashes/XSetDashes
+	/Xlib8/XSetDashes/XSetDashes
 
 XSetFillRule
 	"VSW5TESTSUITE CASE XSetFillRule 4"
-	/tset/Xlib8/XSetFillRule/XSetFillRule
+	/Xlib8/XSetFillRule/XSetFillRule
 
 XSetFillStyle
 	"VSW5TESTSUITE CASE XSetFillStyle 4"
-	/tset/Xlib8/XSetFillStyle/XSetFillStyle
+	/Xlib8/XSetFillStyle/XSetFillStyle
 
 XSetFunction
 	"VSW5TESTSUITE CASE XSetFunction 4"
-	/tset/Xlib8/XSetFunction/XSetFunction
+	/Xlib8/XSetFunction/XSetFunction
 
 XSetFont
 	"VSW5TESTSUITE CASE XSetFont 4"
-	/tset/Xlib8/XSetFont/XSetFont
+	/Xlib8/XSetFont/XSetFont
 
 XSetForeground
 	"VSW5TESTSUITE CASE XSetForeground 3"
-	/tset/Xlib8/XSetForeground/XSetForeground
+	/Xlib8/XSetForeground/XSetForeground
 
 XSetGraphicsExposures
 	"VSW5TESTSUITE CASE XSetGraphicsExposures 4"
-	/tset/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures
+	/Xlib8/XSetGraphicsExposures/XSetGraphicsExposures
 
 XSetLineAttributes
 	"VSW5TESTSUITE CASE XSetLineAttributes 6"
-	/tset/Xlib8/XSetLineAttributes/XSetLineAttributes
+	/Xlib8/XSetLineAttributes/XSetLineAttributes
 
 XSetPlaneMask
 	"VSW5TESTSUITE CASE XSetPlaneMask 3"
-	/tset/Xlib8/XSetPlaneMask/XSetPlaneMask
+	/Xlib8/XSetPlaneMask/XSetPlaneMask
 
 XSetSubwindowMode
 	"VSW5TESTSUITE CASE XSetSubwindowMode 4"
-	/tset/Xlib8/XSetSubwindowMode/XSetSubwindowMode
+	/Xlib8/XSetSubwindowMode/XSetSubwindowMode
 
 XSetStipple
 	"VSW5TESTSUITE CASE XSetStipple 6"
-	/tset/Xlib8/XSetStipple/XSetStipple
+	/Xlib8/XSetStipple/XSetStipple
 
 XSetState
 	"VSW5TESTSUITE CASE XSetState 4"
-	/tset/Xlib8/XSetState/XSetState
+	/Xlib8/XSetState/XSetState
 
 XSetTile
 	"VSW5TESTSUITE CASE XSetTile 6"
-	/tset/Xlib8/XSetTile/XSetTile
+	/Xlib8/XSetTile/XSetTile
 
 XSetTSOrigin
 	"VSW5TESTSUITE CASE XSetTSOrigin 3"
-	/tset/Xlib8/XSetTSOrigin/XSetTSOrigin
+	/Xlib8/XSetTSOrigin/XSetTSOrigin
 
 XFlushGC
 	"VSW5TESTSUITE CASE XFlushGC 2"
-	/tset/Xlib8/XFlushGC/XFlushGC
+	/Xlib8/XFlushGC/XFlushGC
 
 
 # Discrete tests for Xlib Chapter 9-Graphics Functions
 
 XClearArea
 	"VSW5TESTSUITE CASE XClearArea 11"
-	/tset/Xlib9/XClearArea/XClearArea
+	/Xlib9/XClearArea/XClearArea
 
 XClearWindow
 	"VSW5TESTSUITE CASE XClearWindow 7"
-	/tset/Xlib9/XClearWindow/XClearWindow
+	/Xlib9/XClearWindow/XClearWindow
 
 XCopyArea
 	"VSW5TESTSUITE CASE XCopyArea 36"
-	/tset/Xlib9/XCopyArea/XCopyArea
+	/Xlib9/XCopyArea/XCopyArea
 
 XCopyPlane
 	"VSW5TESTSUITE CASE XCopyPlane 43"
-	/tset/Xlib9/XCopyPlane/XCopyPlane
+	/Xlib9/XCopyPlane/XCopyPlane
 
 XDrawArc
 	"VSW5TESTSUITE CASE XDrawArc 102"
-	/tset/Xlib9/XDrawArc/XDrawArc
+	/Xlib9/XDrawArc/XDrawArc
 
 XDrawArcs
 	"VSW5TESTSUITE CASE XDrawArcs 112"
-	/tset/Xlib9/XDrawArcs/XDrawArcs
+	/Xlib9/XDrawArcs/XDrawArcs
 
 XDrawImageString16
 	"VSW5TESTSUITE CASE XDrawImageString16 24"
-	/tset/Xlib9/XDrawImageString16/XDrawImageString16
+	/Xlib9/XDrawImageString16/XDrawImageString16
 
 XDrawImageString
 	"VSW5TESTSUITE CASE XDrawImageString 24"
-	/tset/Xlib9/XDrawImageString/XDrawImageString
+	/Xlib9/XDrawImageString/XDrawImageString
 
 XDrawLine
 	"VSW5TESTSUITE CASE XDrawLine 91"
-	/tset/Xlib9/XDrawLine/XDrawLine
+	/Xlib9/XDrawLine/XDrawLine
 
 XDrawLines
 	"VSW5TESTSUITE CASE XDrawLines 104"
-	/tset/Xlib9/XDrawLines/XDrawLines
+	/Xlib9/XDrawLines/XDrawLines
 
 XDrawPoint
 	"VSW5TESTSUITE CASE XDrawPoint 34"
-	/tset/Xlib9/XDrawPoint/XDrawPoint
+	/Xlib9/XDrawPoint/XDrawPoint
 
 XDrawPoints
 	"VSW5TESTSUITE CASE XDrawPoints 38"
-	/tset/Xlib9/XDrawPoints/XDrawPoints
+	/Xlib9/XDrawPoints/XDrawPoints
 
 XDrawRectangle
 	"VSW5TESTSUITE CASE XDrawRectangle 83"
-	/tset/Xlib9/XDrawRectangle/XDrawRectangle
+	/Xlib9/XDrawRectangle/XDrawRectangle
 
 XDrawRectangles
 	"VSW5TESTSUITE CASE XDrawRectangles 85"
-	/tset/Xlib9/XDrawRectangles/XDrawRectangles
+	/Xlib9/XDrawRectangles/XDrawRectangles
 
 XDrawSegments
 	"VSW5TESTSUITE CASE XDrawSegments 92"
-	/tset/Xlib9/XDrawSegments/XDrawSegments
+	/Xlib9/XDrawSegments/XDrawSegments
 
 XDrawString
 	"VSW5TESTSUITE CASE XDrawString 44"
-	/tset/Xlib9/XDrawString/XDrawString
+	/Xlib9/XDrawString/XDrawString
 
 XDrawString16
 	"VSW5TESTSUITE CASE XDrawString16 44"
-	/tset/Xlib9/XDrawString16/XDrawString16
+	/Xlib9/XDrawString16/XDrawString16
 
 XDrawText
 	"VSW5TESTSUITE CASE XDrawText 50"
-	/tset/Xlib9/XDrawText/XDrawText
+	/Xlib9/XDrawText/XDrawText
 
 XDrawText16
 	"VSW5TESTSUITE CASE XDrawText16 50"
-	/tset/Xlib9/XDrawText16/XDrawText16
+	/Xlib9/XDrawText16/XDrawText16
 
 XFillArc
 	"VSW5TESTSUITE CASE XFillArc 44"
-	/tset/Xlib9/XFillArc/XFillArc
+	/Xlib9/XFillArc/XFillArc
 
 XFillArcs
 	"VSW5TESTSUITE CASE XFillArcs 46"
-	/tset/Xlib9/XFillArcs/XFillArcs
+	/Xlib9/XFillArcs/XFillArcs
 
 XFillPolygon
 	"VSW5TESTSUITE CASE XFillPolygon 55"
-	/tset/Xlib9/XFillPolygon/XFillPolygon
+	/Xlib9/XFillPolygon/XFillPolygon
 
 XFillRectangle
 	"VSW5TESTSUITE CASE XFillRectangle 43"
-	/tset/Xlib9/XFillRectangle/XFillRectangle
+	/Xlib9/XFillRectangle/XFillRectangle
 
 XFillRectangles
 	"VSW5TESTSUITE CASE XFillRectangles 44"
-	/tset/Xlib9/XFillRectangles/XFillRectangles
+	/Xlib9/XFillRectangles/XFillRectangles
 
 XFreeFont
 	"VSW5TESTSUITE CASE XFreeFont 3"
-	/tset/Xlib9/XFreeFont/XFreeFont
+	/Xlib9/XFreeFont/XFreeFont
 
 XFreeFontInfo
 	"VSW5TESTSUITE CASE XFreeFontInfo 2"
-	/tset/Xlib9/XFreeFontInfo/XFreeFontInfo
+	/Xlib9/XFreeFontInfo/XFreeFontInfo
 
 XFreeFontNames
 	"VSW5TESTSUITE CASE XFreeFontNames 1"
-	/tset/Xlib9/XFreeFontNames/XFreeFontNames
+	/Xlib9/XFreeFontNames/XFreeFontNames
 
 XFreeFontPath
 	"VSW5TESTSUITE CASE XFreeFontPath 1"
-	/tset/Xlib9/XFreeFontPath/XFreeFontPath
+	/Xlib9/XFreeFontPath/XFreeFontPath
 
 XGetFontProperty
 	"VSW5TESTSUITE CASE XGetFontProperty 2"
-	/tset/Xlib9/XGetFontProperty/XGetFontProperty
+	/Xlib9/XGetFontProperty/XGetFontProperty
 
 XGetFontPath
 	"VSW5TESTSUITE CASE XGetFontPath 1"
-	/tset/Xlib9/XGetFontPath/XGetFontPath
+	/Xlib9/XGetFontPath/XGetFontPath
 
 XGetImage
 	"VSW5TESTSUITE CASE XGetImage 17"
-	/tset/Xlib9/XGetImage/XGetImage
+	/Xlib9/XGetImage/XGetImage
 
 XGetSubImage
 	"VSW5TESTSUITE CASE XGetSubImage 17"
-	/tset/Xlib9/XGetSubImage/XGetSubImage
+	/Xlib9/XGetSubImage/XGetSubImage
 
 XLoadFont
 	"VSW5TESTSUITE CASE XLoadFont 5"
-	/tset/Xlib9/XLoadFont/XLoadFont
+	/Xlib9/XLoadFont/XLoadFont
 
 XLoadQueryFont
 	"VSW5TESTSUITE CASE XLoadQueryFont 5"
-	/tset/Xlib9/XLoadQueryFont/XLoadQueryFont
+	/Xlib9/XLoadQueryFont/XLoadQueryFont
 
 XListFonts
 	"VSW5TESTSUITE CASE XListFonts 6"
-	/tset/Xlib9/XListFonts/XListFonts
+	/Xlib9/XListFonts/XListFonts
 
 XListFontsWithInfo
 	"VSW5TESTSUITE CASE XListFontsWithInfo 7"
-	/tset/Xlib9/XListFontsWithInfo/XListFontsWithInfo
+	/Xlib9/XListFontsWithInfo/XListFontsWithInfo
 
 XPutImage
 	"VSW5TESTSUITE CASE XPutImage 40"
-	/tset/Xlib9/XPutImage/XPutImage
+	/Xlib9/XPutImage/XPutImage
 
 XQueryFont
 	"VSW5TESTSUITE CASE XQueryFont 3"
-	/tset/Xlib9/XQueryFont/XQueryFont
+	/Xlib9/XQueryFont/XQueryFont
 
 XQueryTextExtents16
 	"VSW5TESTSUITE CASE XQueryTextExtents16 13"
-	/tset/Xlib9/XQueryTextExtents16/XQueryTextExtents16
+	/Xlib9/XQueryTextExtents16/XQueryTextExtents16
 
 XQueryTextExtents
 	"VSW5TESTSUITE CASE XQueryTextExtents 12"
-	/tset/Xlib9/XQueryTextExtents/XQueryTextExtents
+	/Xlib9/XQueryTextExtents/XQueryTextExtents
 
 XSetFontPath
 	"VSW5TESTSUITE CASE XSetFontPath 4"
-	/tset/Xlib9/XSetFontPath/XSetFontPath
+	/Xlib9/XSetFontPath/XSetFontPath
 
 XTextExtents16
 	"VSW5TESTSUITE CASE XTextExtents16 11"
-	/tset/Xlib9/XTextExtents16/XTextExtents16
+	/Xlib9/XTextExtents16/XTextExtents16
 
 XTextExtents
 	"VSW5TESTSUITE CASE XTextExtents 10"
-	/tset/Xlib9/XTextExtents/XTextExtents
+	/Xlib9/XTextExtents/XTextExtents
 
 XTextWidth
 	"VSW5TESTSUITE CASE XTextWidth 1"
-	/tset/Xlib9/XTextWidth/XTextWidth
+	/Xlib9/XTextWidth/XTextWidth
 
 XTextWidth16
 	"VSW5TESTSUITE CASE XTextWidth16 2"
-	/tset/Xlib9/XTextWidth16/XTextWidth16
+	/Xlib9/XTextWidth16/XTextWidth16
 
 XUnloadFont
 	"VSW5TESTSUITE CASE XUnloadFont 3"
-	/tset/Xlib9/XUnloadFont/XUnloadFont
+	/Xlib9/XUnloadFont/XUnloadFont
 
 
 # Discrete tests for XOpen Specific Requirements
 
 xXAllocNamedColor
 	"VSW5TESTSUITE CASE XAllocNamedColor 7"
-	/tset/Xopen/XAllocNamedColor/XAllocNamedColor
+	/Xopen/XAllocNamedColor/XAllocNamedColor
 
 xcursorfont
 	"VSW5TESTSUITE CASE cursorfont 32"
-	/tset/Xopen/cursorfont/cursorfont
+	/Xopen/cursorfont/cursorfont
 
 xXCreateFontCursor
 	"VSW5TESTSUITE CASE XCreateFontCursor 31"
-	/tset/Xopen/XCreateFontCursor/XCreateFontCursor
+	/Xopen/XCreateFontCursor/XCreateFontCursor
 
 xkeysym
 	"VSW5TESTSUITE CASE keysym 7"
-	/tset/Xopen/keysym/keysym
+	/Xopen/keysym/keysym
 
 xkeysymdef
 	"VSW5TESTSUITE CASE keysymdef 15"
-	/tset/Xopen/keysymdef/keysymdef
+	/Xopen/keysymdef/keysymdef
 
 xXKeysymToKeycode
 	"VSW5TESTSUITE CASE XKeysymToKeycode 14"
-	/tset/Xopen/XKeysymToKeycode/XKeysymToKeycode
+	/Xopen/XKeysymToKeycode/XKeysymToKeycode
 
 xXLookupColor
 	"VSW5TESTSUITE CASE XLookupColor 7"
-	/tset/Xopen/XLookupColor/XLookupColor
+	/Xopen/XLookupColor/XLookupColor
 
 xXStringToKeysym
 	"VSW5TESTSUITE CASE XStringToKeysym 14"
-	/tset/Xopen/XStringToKeysym/XStringToKeysym
+	/Xopen/XStringToKeysym/XStringToKeysym
 
 
 # Discrete tests for X Server Protocol
 
 pAllocColor
 	"VSW5TESTSUITE CASE AllocColor 3"
-	/tset/Xproto/pAllocColor/pAllocColor
+	/Xproto/pAllocColor/pAllocColor
 
 pAllocColorCells
 	"VSW5TESTSUITE CASE AllocColorCells 3"
-	/tset/Xproto/pAllocColorCells/pAllocColorCells
+	/Xproto/pAllocColorCells/pAllocColorCells
 
 pAllocColorPlanes
 	"VSW5TESTSUITE CASE AllocColorPlanes 3"
-	/tset/Xproto/pAllocColorPlanes/pAllocColorPlanes
+	/Xproto/pAllocColorPlanes/pAllocColorPlanes
 
 pAllocNamedColor
 	"VSW5TESTSUITE CASE AllocNamedColor 3"
-	/tset/Xproto/pAllocNamedColor/pAllocNamedColor
+	/Xproto/pAllocNamedColor/pAllocNamedColor
 
 pAllowEvents
 	"VSW5TESTSUITE CASE AllowEvents 3"
-	/tset/Xproto/pAllowEvents/pAllowEvents
+	/Xproto/pAllowEvents/pAllowEvents
 
 pBadRequest
 	"VSW5TESTSUITE CASE BadRequest 1"
-	/tset/Xproto/pBadRequest/pBadRequest
+	/Xproto/pBadRequest/pBadRequest
 
 pBell
 	"VSW5TESTSUITE CASE Bell 3"
-	/tset/Xproto/pBell/pBell
+	/Xproto/pBell/pBell
 
 pChangeActivePointerGrab
 	"VSW5TESTSUITE CASE ChangeActivePointerGrab 3"
-	/tset/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab
+	/Xproto/pChangeActivePointerGrab/pChangeActivePointerGrab
 
 pChangeGC
 	"VSW5TESTSUITE CASE ChangeGC 4"
-	/tset/Xproto/pChangeGC/pChangeGC
+	/Xproto/pChangeGC/pChangeGC
 
 pChangeHosts
 	"VSW5TESTSUITE CASE ChangeHosts 3"
-	/tset/Xproto/pChangeHosts/pChangeHosts
+	/Xproto/pChangeHosts/pChangeHosts
 
 pChangeKeyboardControl
 	"VSW5TESTSUITE CASE ChangeKeyboardControl 4"
-	/tset/Xproto/pChangeKeyboardControl/pChangeKeyboardControl
+	/Xproto/pChangeKeyboardControl/pChangeKeyboardControl
 
 pChangeKeyboardMapping
 	"VSW5TESTSUITE CASE ChangeKeyboardMapping 3"
-	/tset/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping
+	/Xproto/pChangeKeyboardMapping/pChangeKeyboardMapping
 
 pChangePointerControl
 	"VSW5TESTSUITE CASE ChangePointerControl 3"
-	/tset/Xproto/pChangePointerControl/pChangePointerControl
+	/Xproto/pChangePointerControl/pChangePointerControl
 
 pChangeProperty
 	"VSW5TESTSUITE CASE ChangeProperty 3"
-	/tset/Xproto/pChangeProperty/pChangeProperty
+	/Xproto/pChangeProperty/pChangeProperty
 
 pChangeSaveSet
 	"VSW5TESTSUITE CASE ChangeSaveSet 3"
-	/tset/Xproto/pChangeSaveSet/pChangeSaveSet
+	/Xproto/pChangeSaveSet/pChangeSaveSet
 
 pChangeWindowAttributes
 	"VSW5TESTSUITE CASE ChangeWindowAttributes 4"
-	/tset/Xproto/pChangeWindowAttributes/pChangeWindowAttributes
+	/Xproto/pChangeWindowAttributes/pChangeWindowAttributes
 
 pClearArea
 	"VSW5TESTSUITE CASE ClearArea 3"
-	/tset/Xproto/pClearArea/pClearArea
+	/Xproto/pClearArea/pClearArea
 
 pCloseFont
 	"VSW5TESTSUITE CASE CloseFont 3"
-	/tset/Xproto/pCloseFont/pCloseFont
+	/Xproto/pCloseFont/pCloseFont
 
 pConfigureWindow
 	"VSW5TESTSUITE CASE ConfigureWindow 4"
-	/tset/Xproto/pConfigureWindow/pConfigureWindow
+	/Xproto/pConfigureWindow/pConfigureWindow
 
 pConvertSelection
 	"VSW5TESTSUITE CASE ConvertSelection 3"
-	/tset/Xproto/pConvertSelection/pConvertSelection
+	/Xproto/pConvertSelection/pConvertSelection
 
 pCopyArea
 	"VSW5TESTSUITE CASE CopyArea 3"
-	/tset/Xproto/pCopyArea/pCopyArea
+	/Xproto/pCopyArea/pCopyArea
 
 pCopyColormapAndFree
 	"VSW5TESTSUITE CASE CopyColormapAndFree 5"
-	/tset/Xproto/pCopyColormapAndFree/pCopyColormapAndFree
+	/Xproto/pCopyColormapAndFree/pCopyColormapAndFree
 
 pCopyGC
 	"VSW5TESTSUITE CASE CopyGC 4"
-	/tset/Xproto/pCopyGC/pCopyGC
+	/Xproto/pCopyGC/pCopyGC
 
 pCopyPlane
 	"VSW5TESTSUITE CASE CopyPlane 3"
-	/tset/Xproto/pCopyPlane/pCopyPlane
+	/Xproto/pCopyPlane/pCopyPlane
 
 pCirculateWindow
 	"VSW5TESTSUITE CASE CirculateWindow 3"
-	/tset/Xproto/pCirculateWindow/pCirculateWindow
+	/Xproto/pCirculateWindow/pCirculateWindow
 
 pCreateColormap
 	"VSW5TESTSUITE CASE CreateColormap 5"
-	/tset/Xproto/pCreateColormap/pCreateColormap
+	/Xproto/pCreateColormap/pCreateColormap
 
 pCreateCursor
 	"VSW5TESTSUITE CASE CreateCursor 5"
-	/tset/Xproto/pCreateCursor/pCreateCursor
+	/Xproto/pCreateCursor/pCreateCursor
 
 pCreateGC
 	"VSW5TESTSUITE CASE CreateGC 6"
-	/tset/Xproto/pCreateGC/pCreateGC
+	/Xproto/pCreateGC/pCreateGC
 
 pCreateGlyphCursor
 	"VSW5TESTSUITE CASE CreateGlyphCursor 5"
-	/tset/Xproto/pCreateGlyphCursor/pCreateGlyphCursor
+	/Xproto/pCreateGlyphCursor/pCreateGlyphCursor
 
 pCreatePixmap
 	"VSW5TESTSUITE CASE CreatePixmap 5"
-	/tset/Xproto/pCreatePixmap/pCreatePixmap
+	/Xproto/pCreatePixmap/pCreatePixmap
 
 pCreateWindow
 	"VSW5TESTSUITE CASE CreateWindow 6"
-	/tset/Xproto/pCreateWindow/pCreateWindow
+	/Xproto/pCreateWindow/pCreateWindow
 
 pDeleteProperty
 	"VSW5TESTSUITE CASE DeleteProperty 3"
-	/tset/Xproto/pDeleteProperty/pDeleteProperty
+	/Xproto/pDeleteProperty/pDeleteProperty
 
 pDestroySubwindows
 	"VSW5TESTSUITE CASE DestroySubwindows 3"
-	/tset/Xproto/pDestroySubwindows/pDestroySubwindows
+	/Xproto/pDestroySubwindows/pDestroySubwindows
 
 pDestroyWindow
 	"VSW5TESTSUITE CASE DestroyWindow 3"
-	/tset/Xproto/pDestroyWindow/pDestroyWindow
+	/Xproto/pDestroyWindow/pDestroyWindow
 
 pFillPoly
 	"VSW5TESTSUITE CASE FillPoly 3"
-	/tset/Xproto/pFillPoly/pFillPoly
+	/Xproto/pFillPoly/pFillPoly
 
 pFreeColormap
 	"VSW5TESTSUITE CASE FreeColormap 3"
-	/tset/Xproto/pFreeColormap/pFreeColormap
+	/Xproto/pFreeColormap/pFreeColormap
 
 pFreeColors
 	"VSW5TESTSUITE CASE FreeColors 3"
-	/tset/Xproto/pFreeColors/pFreeColors
+	/Xproto/pFreeColors/pFreeColors
 
 pFreeCursor
 	"VSW5TESTSUITE CASE FreeCursor 3"
-	/tset/Xproto/pFreeCursor/pFreeCursor
+	/Xproto/pFreeCursor/pFreeCursor
 
 pForceScreenSaver
 	"VSW5TESTSUITE CASE ForceScreenSaver 3"
-	/tset/Xproto/pForceScreenSaver/pForceScreenSaver
+	/Xproto/pForceScreenSaver/pForceScreenSaver
 
 pFreeGC
 	"VSW5TESTSUITE CASE FreeGC 3"
-	/tset/Xproto/pFreeGC/pFreeGC
+	/Xproto/pFreeGC/pFreeGC
 
 pFreePixmap
 	"VSW5TESTSUITE CASE FreePixmap 3"
-	/tset/Xproto/pFreePixmap/pFreePixmap
+	/Xproto/pFreePixmap/pFreePixmap
 
 pGrabButton
 	"VSW5TESTSUITE CASE GrabButton 3"
-	/tset/Xproto/pGrabButton/pGrabButton
+	/Xproto/pGrabButton/pGrabButton
 
 pGrabKey
 	"VSW5TESTSUITE CASE GrabKey 3"
-	/tset/Xproto/pGrabKey/pGrabKey
+	/Xproto/pGrabKey/pGrabKey
 
 pGrabKeyboard
 	"VSW5TESTSUITE CASE GrabKeyboard 3"
-	/tset/Xproto/pGrabKeyboard/pGrabKeyboard
+	/Xproto/pGrabKeyboard/pGrabKeyboard
 
 pGrabPointer
 	"VSW5TESTSUITE CASE GrabPointer 3"
-	/tset/Xproto/pGrabPointer/pGrabPointer
+	/Xproto/pGrabPointer/pGrabPointer
 
 pGrabServer
 	"VSW5TESTSUITE CASE GrabServer 3"
-	/tset/Xproto/pGrabServer/pGrabServer
+	/Xproto/pGrabServer/pGrabServer
 
 pGetAtomName
 	"VSW5TESTSUITE CASE GetAtomName 3"
-	/tset/Xproto/pGetAtomName/pGetAtomName
+	/Xproto/pGetAtomName/pGetAtomName
 
 pGetFontPath
 	"VSW5TESTSUITE CASE GetFontPath 3"
-	/tset/Xproto/pGetFontPath/pGetFontPath
+	/Xproto/pGetFontPath/pGetFontPath
 
 pGetGeometry
 	"VSW5TESTSUITE CASE GetGeometry 3"
-	/tset/Xproto/pGetGeometry/pGetGeometry
+	/Xproto/pGetGeometry/pGetGeometry
 
 pGetImage
 	"VSW5TESTSUITE CASE GetImage 3"
-	/tset/Xproto/pGetImage/pGetImage
+	/Xproto/pGetImage/pGetImage
 
 pGetInputFocus
 	"VSW5TESTSUITE CASE GetInputFocus 3"
-	/tset/Xproto/pGetInputFocus/pGetInputFocus
+	/Xproto/pGetInputFocus/pGetInputFocus
 
 pGetKeyboardControl
 	"VSW5TESTSUITE CASE GetKeyboardControl 3"
-	/tset/Xproto/pGetKeyboardControl/pGetKeyboardControl
+	/Xproto/pGetKeyboardControl/pGetKeyboardControl
 
 pGetKeyboardMapping
 	"VSW5TESTSUITE CASE GetKeyboardMapping 3"
-	/tset/Xproto/pGetKeyboardMapping/pGetKeyboardMapping
+	/Xproto/pGetKeyboardMapping/pGetKeyboardMapping
 
 pGetModifierMapping
 	"VSW5TESTSUITE CASE GetModifierMapping 3"
-	/tset/Xproto/pGetModifierMapping/pGetModifierMapping
+	/Xproto/pGetModifierMapping/pGetModifierMapping
 
 pGetMotionEvents
 	"VSW5TESTSUITE CASE GetMotionEvents 3"
-	/tset/Xproto/pGetMotionEvents/pGetMotionEvents
+	/Xproto/pGetMotionEvents/pGetMotionEvents
 
 pGetPointerControl
 	"VSW5TESTSUITE CASE GetPointerControl 3"
-	/tset/Xproto/pGetPointerControl/pGetPointerControl
+	/Xproto/pGetPointerControl/pGetPointerControl
 
 pGetPointerMapping
 	"VSW5TESTSUITE CASE GetPointerMapping 3"
-	/tset/Xproto/pGetPointerMapping/pGetPointerMapping
+	/Xproto/pGetPointerMapping/pGetPointerMapping
 
 pGetProperty
 	"VSW5TESTSUITE CASE GetProperty 3"
-	/tset/Xproto/pGetProperty/pGetProperty
+	/Xproto/pGetProperty/pGetProperty
 
 pGetScreenSaver
 	"VSW5TESTSUITE CASE GetScreenSaver 3"
-	/tset/Xproto/pGetScreenSaver/pGetScreenSaver
+	/Xproto/pGetScreenSaver/pGetScreenSaver
 
 pGetSelectionOwner
 	"VSW5TESTSUITE CASE GetSelectionOwner 3"
-	/tset/Xproto/pGetSelectionOwner/pGetSelectionOwner
+	/Xproto/pGetSelectionOwner/pGetSelectionOwner
 
 pGetWindowAttributes
 	"VSW5TESTSUITE CASE GetWindowAttributes 3"
-	/tset/Xproto/pGetWindowAttributes/pGetWindowAttributes
+	/Xproto/pGetWindowAttributes/pGetWindowAttributes
 
 pImageText16
 	"VSW5TESTSUITE CASE ImageText16 3"
-	/tset/Xproto/pImageText16/pImageText16
+	/Xproto/pImageText16/pImageText16
 
 pImageText8
 	"VSW5TESTSUITE CASE ImageText8 3"
-	/tset/Xproto/pImageText8/pImageText8
+	/Xproto/pImageText8/pImageText8
 
 pInstallColormap
 	"VSW5TESTSUITE CASE InstallColormap 3"
-	/tset/Xproto/pInstallColormap/pInstallColormap
+	/Xproto/pInstallColormap/pInstallColormap
 
 pInternAtom
 	"VSW5TESTSUITE CASE InternAtom 3"
-	/tset/Xproto/pInternAtom/pInternAtom
+	/Xproto/pInternAtom/pInternAtom
 
 pKillClient
 	"VSW5TESTSUITE CASE KillClient 3"
-	/tset/Xproto/pKillClient/pKillClient
+	/Xproto/pKillClient/pKillClient
 
 pLookupColor
 	"VSW5TESTSUITE CASE LookupColor 3"
-	/tset/Xproto/pLookupColor/pLookupColor
+	/Xproto/pLookupColor/pLookupColor
 
 pListExtensions
 	"VSW5TESTSUITE CASE ListExtensions 3"
-	/tset/Xproto/pListExtensions/pListExtensions
+	/Xproto/pListExtensions/pListExtensions
 
 pListFonts
 	"VSW5TESTSUITE CASE ListFonts 3"
-	/tset/Xproto/pListFonts/pListFonts
+	/Xproto/pListFonts/pListFonts
 
 pListFontsWithInfo
 	"VSW5TESTSUITE CASE ListFontsWithInfo 3"
-	/tset/Xproto/pListFontsWithInfo/pListFontsWithInfo
+	/Xproto/pListFontsWithInfo/pListFontsWithInfo
 
 pListHosts
 	"VSW5TESTSUITE CASE ListHosts 3"
-	/tset/Xproto/pListHosts/pListHosts
+	/Xproto/pListHosts/pListHosts
 
 pListInstalledColormaps
 	"VSW5TESTSUITE CASE ListInstalledColormaps 3"
-	/tset/Xproto/pListInstalledColormaps/pListInstalledColormaps
+	/Xproto/pListInstalledColormaps/pListInstalledColormaps
 
 pListProperties
 	"VSW5TESTSUITE CASE ListProperties 3"
-	/tset/Xproto/pListProperties/pListProperties
+	/Xproto/pListProperties/pListProperties
 
 pMapSubwindows
 	"VSW5TESTSUITE CASE MapSubwindows 3"
-	/tset/Xproto/pMapSubwindows/pMapSubwindows
+	/Xproto/pMapSubwindows/pMapSubwindows
 
 pMapWindow
 	"VSW5TESTSUITE CASE MapWindow 3"
-	/tset/Xproto/pMapWindow/pMapWindow
+	/Xproto/pMapWindow/pMapWindow
 
 pNoOperation
 	"VSW5TESTSUITE CASE NoOperation 4"
-	/tset/Xproto/pNoOperation/pNoOperation
+	/Xproto/pNoOperation/pNoOperation
 
 pOpenDisplay
 	"VSW5TESTSUITE CASE OpenDisplay 2"
-	/tset/Xproto/pOpenDisplay/pOpenDisplay
+	/Xproto/pOpenDisplay/pOpenDisplay
 
 pOpenFont
 	"VSW5TESTSUITE CASE OpenFont 5"
-	/tset/Xproto/pOpenFont/pOpenFont
+	/Xproto/pOpenFont/pOpenFont
 
 pPolyArc
 	"VSW5TESTSUITE CASE PolyArc 3"
-	/tset/Xproto/pPolyArc/pPolyArc
+	/Xproto/pPolyArc/pPolyArc
 
 pPolyFillArc
 	"VSW5TESTSUITE CASE PolyFillArc 3"
-	/tset/Xproto/pPolyFillArc/pPolyFillArc
+	/Xproto/pPolyFillArc/pPolyFillArc
 
 pPolyFillRectangle
 	"VSW5TESTSUITE CASE PolyFillRectangle 3"
-	/tset/Xproto/pPolyFillRectangle/pPolyFillRectangle
+	/Xproto/pPolyFillRectangle/pPolyFillRectangle
 
 pPolyLine
 	"VSW5TESTSUITE CASE PolyLine 3"
-	/tset/Xproto/pPolyLine/pPolyLine
+	/Xproto/pPolyLine/pPolyLine
 
 pPolyPoint
 	"VSW5TESTSUITE CASE PolyPoint 3"
-	/tset/Xproto/pPolyPoint/pPolyPoint
+	/Xproto/pPolyPoint/pPolyPoint
 
 pPolyRectangle
 	"VSW5TESTSUITE CASE PolyRectangle 3"
-	/tset/Xproto/pPolyRectangle/pPolyRectangle
+	/Xproto/pPolyRectangle/pPolyRectangle
 
 pPolySegment
 	"VSW5TESTSUITE CASE PolySegment 3"
-	/tset/Xproto/pPolySegment/pPolySegment
+	/Xproto/pPolySegment/pPolySegment
 
 pPolyText16
 	"VSW5TESTSUITE CASE PolyText16 3"
-	/tset/Xproto/pPolyText16/pPolyText16
+	/Xproto/pPolyText16/pPolyText16
 
 pPolyText8
 	"VSW5TESTSUITE CASE PolyText8 3"
-	/tset/Xproto/pPolyText8/pPolyText8
+	/Xproto/pPolyText8/pPolyText8
 
 pPutImage
 	"VSW5TESTSUITE CASE PutImage 3"
-	/tset/Xproto/pPutImage/pPutImage
+	/Xproto/pPutImage/pPutImage
 
 pQueryBestSize
 	"VSW5TESTSUITE CASE QueryBestSize 3"
-	/tset/Xproto/pQueryBestSize/pQueryBestSize
+	/Xproto/pQueryBestSize/pQueryBestSize
 
 pQueryColors
 	"VSW5TESTSUITE CASE QueryColors 3"
-	/tset/Xproto/pQueryColors/pQueryColors
+	/Xproto/pQueryColors/pQueryColors
 
 pQueryExtension
 	"VSW5TESTSUITE CASE QueryExtension 3"
-	/tset/Xproto/pQueryExtension/pQueryExtension
+	/Xproto/pQueryExtension/pQueryExtension
 
 pQueryFont
 	"VSW5TESTSUITE CASE QueryFont 3"
-	/tset/Xproto/pQueryFont/pQueryFont
+	/Xproto/pQueryFont/pQueryFont
 
 pQueryKeymap
 	"VSW5TESTSUITE CASE QueryKeymap 3"
-	/tset/Xproto/pQueryKeymap/pQueryKeymap
+	/Xproto/pQueryKeymap/pQueryKeymap
 
 pQueryPointer
 	"VSW5TESTSUITE CASE QueryPointer 3"
-	/tset/Xproto/pQueryPointer/pQueryPointer
+	/Xproto/pQueryPointer/pQueryPointer
 
 pQueryTree
 	"VSW5TESTSUITE CASE QueryTree 3"
-	/tset/Xproto/pQueryTree/pQueryTree
+	/Xproto/pQueryTree/pQueryTree
 
 pQueryTextExtents
 	"VSW5TESTSUITE CASE QueryTextExtents 3"
-	/tset/Xproto/pQueryTextExtents/pQueryTextExtents
+	/Xproto/pQueryTextExtents/pQueryTextExtents
 
 pRecolorCursor
 	"VSW5TESTSUITE CASE RecolorCursor 3"
-	/tset/Xproto/pRecolorCursor/pRecolorCursor
+	/Xproto/pRecolorCursor/pRecolorCursor
 
 pReparentWindow
 	"VSW5TESTSUITE CASE ReparentWindow 3"
-	/tset/Xproto/pReparentWindow/pReparentWindow
+	/Xproto/pReparentWindow/pReparentWindow
 
 pRotateProperties
 	"VSW5TESTSUITE CASE RotateProperties 3"
-	/tset/Xproto/pRotateProperties/pRotateProperties
+	/Xproto/pRotateProperties/pRotateProperties
 
 pSendEvent
 	"VSW5TESTSUITE CASE SendEvent 3"
-	/tset/Xproto/pSendEvent/pSendEvent
+	/Xproto/pSendEvent/pSendEvent
 
 pSetAccessControl
 	"VSW5TESTSUITE CASE SetAccessControl 3"
-	/tset/Xproto/pSetAccessControl/pSetAccessControl
+	/Xproto/pSetAccessControl/pSetAccessControl
 
 pSetClipRectangles
 	"VSW5TESTSUITE CASE SetClipRectangles 3"
-	/tset/Xproto/pSetClipRectangles/pSetClipRectangles
+	/Xproto/pSetClipRectangles/pSetClipRectangles
 
 pSetCloseDownMode
 	"VSW5TESTSUITE CASE SetCloseDownMode 3"
-	/tset/Xproto/pSetCloseDownMode/pSetCloseDownMode
+	/Xproto/pSetCloseDownMode/pSetCloseDownMode
 
 pSetDashes
 	"VSW5TESTSUITE CASE SetDashes 3"
-	/tset/Xproto/pSetDashes/pSetDashes
+	/Xproto/pSetDashes/pSetDashes
 
 pSetFontPath
 	"VSW5TESTSUITE CASE SetFontPath 3"
-	/tset/Xproto/pSetFontPath/pSetFontPath
+	/Xproto/pSetFontPath/pSetFontPath
 
 pSetInputFocus
 	"VSW5TESTSUITE CASE SetInputFocus 3"
-	/tset/Xproto/pSetInputFocus/pSetInputFocus
+	/Xproto/pSetInputFocus/pSetInputFocus
 
 pSetModifierMapping
 	"VSW5TESTSUITE CASE SetModifierMapping 3"
-	/tset/Xproto/pSetModifierMapping/pSetModifierMapping
+	/Xproto/pSetModifierMapping/pSetModifierMapping
 
 pSetPointerMapping
 	"VSW5TESTSUITE CASE SetPointerMapping 3"
-	/tset/Xproto/pSetPointerMapping/pSetPointerMapping
+	/Xproto/pSetPointerMapping/pSetPointerMapping
 
 pStoreColors
 	"VSW5TESTSUITE CASE StoreColors 4"
-	/tset/Xproto/pStoreColors/pStoreColors
+	/Xproto/pStoreColors/pStoreColors
 
 pStoreNamedColor
 	"VSW5TESTSUITE CASE StoreNamedColor 4"
-	/tset/Xproto/pStoreNamedColor/pStoreNamedColor
+	/Xproto/pStoreNamedColor/pStoreNamedColor
 
 pSetScreenSaver
 	"VSW5TESTSUITE CASE SetScreenSaver 3"
-	/tset/Xproto/pSetScreenSaver/pSetScreenSaver
+	/Xproto/pSetScreenSaver/pSetScreenSaver
 
 pSetSelectionOwner
 	"VSW5TESTSUITE CASE SetSelectionOwner 3"
-	/tset/Xproto/pSetSelectionOwner/pSetSelectionOwner
+	/Xproto/pSetSelectionOwner/pSetSelectionOwner
 
 pTranslateCoords
 	"VSW5TESTSUITE CASE TranslateCoords 3"
-	/tset/Xproto/pTranslateCoords/pTranslateCoords
+	/Xproto/pTranslateCoords/pTranslateCoords
 
 pUngrabButton
 	"VSW5TESTSUITE CASE UngrabButton 3"
-	/tset/Xproto/pUngrabButton/pUngrabButton
+	/Xproto/pUngrabButton/pUngrabButton
 
 pUngrabKey
 	"VSW5TESTSUITE CASE UngrabKey 3"
-	/tset/Xproto/pUngrabKey/pUngrabKey
+	/Xproto/pUngrabKey/pUngrabKey
 
 pUngrabKeyboard
 	"VSW5TESTSUITE CASE UngrabKeyboard 3"
-	/tset/Xproto/pUngrabKeyboard/pUngrabKeyboard
+	/Xproto/pUngrabKeyboard/pUngrabKeyboard
 
 pUngrabPointer
 	"VSW5TESTSUITE CASE UngrabPointer 3"
-	/tset/Xproto/pUngrabPointer/pUngrabPointer
+	/Xproto/pUngrabPointer/pUngrabPointer
 
 pUngrabServer
 	"VSW5TESTSUITE CASE UngrabServer 3"
-	/tset/Xproto/pUngrabServer/pUngrabServer
+	/Xproto/pUngrabServer/pUngrabServer
 
 pUnmapSubwindows
 	"VSW5TESTSUITE CASE UnmapSubwindows 3"
-	/tset/Xproto/pUnmapSubwindows/pUnmapSubwindows
+	/Xproto/pUnmapSubwindows/pUnmapSubwindows
 
 pUnmapWindow
 	"VSW5TESTSUITE CASE UnmapWindow 3"
-	/tset/Xproto/pUnmapWindow/pUnmapWindow
+	/Xproto/pUnmapWindow/pUnmapWindow
 
 pUninstallColormap
 	"VSW5TESTSUITE CASE UninstallColormap 3"
-	/tset/Xproto/pUninstallColormap/pUninstallColormap
+	/Xproto/pUninstallColormap/pUninstallColormap
 
 pWarpPointer
 	"VSW5TESTSUITE CASE WarpPointer 3"
-	/tset/Xproto/pWarpPointer/pWarpPointer
+	/Xproto/pWarpPointer/pWarpPointer
 
 #Discrete tests for Xt Chapter 3
 
 XtDataTypes
 	"VSW5TESTSUITE CASE DataTypes 9"
-	/tset/Xt3/DataTypes/DataTypes
+	/Xt3/DataTypes/DataTypes
 
 CoreWidget
 	"VSW5TESTSUITE CASE CoreWidget 9"
-	/tset/Xt3/CoreWidget/CoreWidget
+	/Xt3/CoreWidget/CoreWidget
 
 CompositeWidget
 	"VSW5TESTSUITE CASE CompositeWidget 11"
-	/tset/Xt3/CompositeWidget/CompositeWidget
+	/Xt3/CompositeWidget/CompositeWidget
 
 ConstraintWidget
 	"VSW5TESTSUITE CASE ConstraintWidget 11"
-	/tset/Xt3/ConstraintWidget/ConstraintWidget
+	/Xt3/ConstraintWidget/ConstraintWidget
 
 XtClass
 	"VSW5TESTSUITE CASE XtClass 1"
-	/tset/Xt3/XtClass/XtClass
+	/Xt3/XtClass/XtClass
 
 XtSuperClass
 	"VSW5TESTSUITE CASE XtSuperClass 1"
-	/tset/Xt3/XtSuperClass/XtSuperClass
+	/Xt3/XtSuperClass/XtSuperClass
 
 XtIsSubclass
 	"VSW5TESTSUITE CASE XtIsSubclass 2"
-	/tset/Xt3/XtIsSubclass/XtIsSubclass
+	/Xt3/XtIsSubclass/XtIsSubclass
 
 XtIsObject
 	"VSW5TESTSUITE CASE XtIsObject 2"
-	/tset/Xt3/XtIsObject/XtIsObject
+	/Xt3/XtIsObject/XtIsObject
 
 XtIsRectObj
 	"VSW5TESTSUITE CASE XtIsRectObj 2"
-	/tset/Xt3/XtIsRectObject/XtIsRectObject
+	/Xt3/XtIsRectObject/XtIsRectObject
 
 XtIsWidget
 	"VSW5TESTSUITE CASE XtIsWidget 2"
-	/tset/Xt3/XtIsWidget/XtIsWidget
+	/Xt3/XtIsWidget/XtIsWidget
 
 XtIsComposite
 	"VSW5TESTSUITE CASE XtIsComposite 2"
-	/tset/Xt3/XtIsComposite/XtIsComposite
+	/Xt3/XtIsComposite/XtIsComposite
 
 XtIsConstraint
 	"VSW5TESTSUITE CASE XtIsConstraint 2"
-	/tset/Xt3/XtIsConstraint/XtIsConstraint
+	/Xt3/XtIsConstraint/XtIsConstraint
 
 XtIsShell
 	"VSW5TESTSUITE CASE XtIsShell 2"
-	/tset/Xt3/XtIsShell/XtIsShell
+	/Xt3/XtIsShell/XtIsShell
 
 XtIsOverrideShell
 	"VSW5TESTSUITE CASE XtIsOverrideShell 2"
-	/tset/Xt3/XtIsOverrideShell/XtIsOverrideShell
+	/Xt3/XtIsOverrideShell/XtIsOverrideShell
 
 XtIsWMShell
 	"VSW5TESTSUITE CASE XtIsWMShell 2"
-	/tset/Xt3/XtIsWMShell/XtIsWMShell
+	/Xt3/XtIsWMShell/XtIsWMShell
 
 XtIsVendorShell
 	"VSW5TESTSUITE CASE XtIsVendorShell 2"
-	/tset/Xt3/XtIsVendorShell/XtIsVendorShell
+	/Xt3/XtIsVendorShell/XtIsVendorShell
 
 XtIsTransientShell
 	"VSW5TESTSUITE CASE XtIsTransientShell 2"
-	/tset/Xt3/XtIsTransientShell/XtIsTransientShell
+	/Xt3/XtIsTransientShell/XtIsTransientShell
 
 XtIsTopLevelShell
 	"VSW5TESTSUITE CASE XtIsTopLevelShell 2"
-	/tset/Xt3/XtIsTopLevelShell/XtIsTopLevelShell
+	/Xt3/XtIsTopLevelShell/XtIsTopLevelShell
 
 XtIsApplicationShell
 	"VSW5TESTSUITE CASE XtIsApplicationShell 2"
-	/tset/Xt3/XtIsApplicationShell/XtIsApplicationShell
+	/Xt3/XtIsApplicationShell/XtIsApplicationShell
 
 XtCheckSubclass
 	"VSW5TESTSUITE CASE XtCheckSubclass 3"
-	/tset/Xt3/XtCheckSubclass/XtCheckSubclass
+	/Xt3/XtCheckSubclass/XtCheckSubclass
 
 XtInitializeWidgetClass
 	"VSW5TESTSUITE CASE XtInitializeWidgetClass 2"
-	/tset/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass
+	/Xt3/XtInitializeWidgetClass/XtInitializeWidgetClass
 
 #Discrete tests for Xt Chapter 4
 
 XtToolkitInitialize
 	"VSW5TESTSUITE CASE XtToolkitInitialize 1"
-	/tset/Xt4/XtToolkitInitialize/XtToolkitInitialize
+	/Xt4/XtToolkitInitialize/XtToolkitInitialize
 
 XtCreateApplicationContext
 	"VSW5TESTSUITE CASE XtCreateApplicationContext 1"
-	/tset/Xt4/XtCreateApplicationContext/XtCreateApplicationContext
+	/Xt4/XtCreateApplicationContext/XtCreateApplicationContext
 
 XtDestroyApplicationContext
 	"VSW5TESTSUITE CASE XtDestoryApplicationContext 2"
-	/tset/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext
+	/Xt4/XtDestroyApplicationContext/XtDestroyApplicationContext
 
 XtWidgetToApplicationContext
 	"VSW5TESTSUITE CASE XtWidgetToApplicationContext 1"
-	/tset/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext
+	/Xt4/XtWidgetToApplicationContext/XtWidgetToApplicationContext
 
 XtDisplayInitialize
 	"VSW5TESTSUITE CASE XtDisplayInitialize 20"
-	/tset/Xt4/XtDisplayInitialize/XtDisplayInitialize
+	/Xt4/XtDisplayInitialize/XtDisplayInitialize
 
 XtOpenDisplay
 	"VSW5TESTSUITE CASE XtOpenDisplay 28"
-	/tset/Xt4/XtOpenDisplay/XtOpenDisplay
+	/Xt4/XtOpenDisplay/XtOpenDisplay
 
 XtCloseDisplay
 	"VSW5TESTSUITE CASE XtCloseDisplay 2"
-	/tset/Xt4/XtCloseDisplay/XtCloseDisplay
+	/Xt4/XtCloseDisplay/XtCloseDisplay
 
 XtSetLanguageProc
 	"VSW5TESTSUITE CASE XtSetLanguageProc 8"
-	/tset/Xt4/XtSetLanguageProc/XtSetLanguageProc
+	/Xt4/XtSetLanguageProc/XtSetLanguageProc
 
 XtScreenDatabase
 	"VSW5TESTSUITE CASE XtScreenDatabase 1"
-	/tset/Xt4/XtScreenDatabase/XtScreenDatabase
+	/Xt4/XtScreenDatabase/XtScreenDatabase
 
 XtDatabase
 	"VSW5TESTSUITE CASE XtDatabase 2"
-	/tset/Xt4/XtDatabase/XtDatabase
+	/Xt4/XtDatabase/XtDatabase
 
 XtAppSetFallbackResources
 	"VSW5TESTSUITE CASE XtAppSetFallbackResources 2"
-	/tset/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources
+	/Xt4/XtAppSetFallbackResources/XtAppSetFallbackResources
 
 XtSetArg
 	"VSW5TESTSUITE CASE XtSetArg 2"
-	/tset/Xt4/XtSetArg/XtSetArg
+	/Xt4/XtSetArg/XtSetArg
 
 XtMergeArgLists
 	"VSW5TESTSUITE CASE XtMergeArgLists 3"
-	/tset/Xt4/XtMergeArgLists/XtMergeArgLists
+	/Xt4/XtMergeArgLists/XtMergeArgLists
 
 XtVaCreateArgsList
 	"VSW5TESTSUITE CASE XtVaCreateArgsList 2"
-	/tset/Xt4/XtCreateVarArgsList/XtCreateVarArgsList
+	/Xt4/XtCreateVarArgsList/XtCreateVarArgsList
 
 XtCreateWidget
 	"VSW5TESTSUITE CASE XtCreateWidget 4"
-	/tset/Xt4/XtCreateWidget/XtCreateWidget
+	/Xt4/XtCreateWidget/XtCreateWidget
 
 XtVaCreateWidget
 	"VSW5TESTSUITE CASE XtVaCreateWidget 8"
-	/tset/Xt4/XtVaCreateWidget/XtVaCreateWidget
+	/Xt4/XtVaCreateWidget/XtVaCreateWidget
 
 XtAppCreateShell
 	"VSW5TESTSUITE CASE XtAppCreateShell 7"
-	/tset/Xt4/XtAppCreateShell/XtAppCreateShell
+	/Xt4/XtAppCreateShell/XtAppCreateShell
 
 XtVaAppCreateShell
 	"VSW5TESTSUITE CASE XtVaAppCreateShell 7"
-	/tset/Xt4/XtVaAppCreateShell/XtVaAppCreateShell
+	/Xt4/XtVaAppCreateShell/XtVaAppCreateShell
 
 XtAppInitialize
 	"VSW5TESTSUITE CASE XtAppInitialize 29"
-	/tset/Xt4/XtAppInitialize/XtAppInitialize
+	/Xt4/XtAppInitialize/XtAppInitialize
 
 XtVaAppInitialize
 	"VSW5TESTSUITE CASE XtVaAppInitialize 29"
-	/tset/Xt4/XtVaAppInitialize/XtVaAppInitialize
+	/Xt4/XtVaAppInitialize/XtVaAppInitialize
 
 XtRealizeWidget
 	"VSW5TESTSUITE CASE XtRealizeWidget 11"
-	/tset/Xt4/XtRealizeWidget/XtRealizeWidget
+	/Xt4/XtRealizeWidget/XtRealizeWidget
 
 XtIsRealized
 	"VSW5TESTSUITE CASE XtIsRealized 3"
-	/tset/Xt4/XtIsRealized/XtIsRealized
+	/Xt4/XtIsRealized/XtIsRealized
 
 XtCreateWindow
 	"VSW5TESTSUITE CASE XtCreateWindow 1"
-	/tset/Xt4/XtCreateWindow/XtCreateWindow
+	/Xt4/XtCreateWindow/XtCreateWindow
 
 XtDisplay
 	"VSW5TESTSUITE CASE XtDisplay 1"
-      	/tset/Xt4/XtDisplay/XtDisplay
+      	/Xt4/XtDisplay/XtDisplay
 
 XtParent
 	"VSW5TESTSUITE CASE XtParent 1"
-	/tset/Xt4/XtParent/XtParent
+	/Xt4/XtParent/XtParent
 
 XtScreen
 	"VSW5TESTSUITE CASE XtScreen 1"
-	/tset/Xt4/XtScreen/XtScreen
+	/Xt4/XtScreen/XtScreen
 
 XtWindow
 	"VSW5TESTSUITE CASE XtWindow 1"
-	/tset/Xt4/XtWindow/XtWindow
+	/Xt4/XtWindow/XtWindow
 
 XtDisplayOfObject
 	"VSW5TESTSUITE CASE XtDisplayOfObject 2"
-	/tset/Xt4/XtDisplayOfObject/XtDisplayOfObject
+	/Xt4/XtDisplayOfObject/XtDisplayOfObject
 
 XtScreenOfObject
 	"VSW5TESTSUITE CASE XtScreenOfObject 2"
-	/tset/Xt4/XtScreenOfObject/XtScreenOfObject
+	/Xt4/XtScreenOfObject/XtScreenOfObject
 
 XtWindowOfObject
 	"VSW5TESTSUITE CASE XtWindowOfObject 2"
-	/tset/Xt4/XtWindowOfObject/XtWindowOfObject
+	/Xt4/XtWindowOfObject/XtWindowOfObject
 
 XtName
 	"VSW5TESTSUITE CASE XtName 1"
-	/tset/Xt4/XtName/XtName
+	/Xt4/XtName/XtName
 
 XtUnrealizeWidget
 	"VSW5TESTSUITE CASE XtUnrealizeWidget 4"
-	/tset/Xt4/XtUnrealizeWidget/XtUnrealizeWidget
+	/Xt4/XtUnrealizeWidget/XtUnrealizeWidget
 
 XtDestroyWidget
 	"VSW5TESTSUITE CASE XtDestroyWidget 3"
-	/tset/Xt4/XtDestroyWidget/XtDestroyWidget
+	/Xt4/XtDestroyWidget/XtDestroyWidget
 
 #Discrete tests for Xt Chapter 5
 
 XtManageChildren
 	"VSW5TESTSUITE CASE XtManageChildren 7"
-	/tset/Xt5/XtManageChildren/XtManageChildren
+	/Xt5/XtManageChildren/XtManageChildren
 
 XtManageChild
 	"VSW5TESTSUITE CASE XtManageChild 6"
-	/tset/Xt5/XtManageChild/XtManageChild
+	/Xt5/XtManageChild/XtManageChild
 
 XtCreateManagedWidget
 	"VSW5TESTSUITE CASE XtCreateManagedWidget 16"
-	/tset/Xt5/XtCreateManagedWidget/XtCreateManagedWidget
+	/Xt5/XtCreateManagedWidget/XtCreateManagedWidget
 
 XtVaCreateManagedWidget
 	"VSW5TESTSUITE CASE XtVaCreateManagedWidget 20"
-	/tset/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget
+	/Xt5/XtVaCreateManagedWidget/XtVaCreateManagedWidget
 
 XtUnmanageChildren
 	"VSW5TESTSUITE CASE XtUnmanageChildren 8"
-	/tset/Xt5/XtUnmanageChildren/XtUnmanageChildren
+	/Xt5/XtUnmanageChildren/XtUnmanageChildren
 
 XtUnmanageChild
 	"VSW5TESTSUITE CASE XtUnmanageChild 7"
-	/tset/Xt5/XtUnmanageChild/XtUnmanageChild
+	/Xt5/XtUnmanageChild/XtUnmanageChild
 
 XtIsManaged
 	"VSW5TESTSUITE CASE XtIsManaged 3"
-	/tset/Xt5/XtIsManaged/XtIsManaged
+	/Xt5/XtIsManaged/XtIsManaged
 
 XtSetMappedWhenManaged
 	"VSW5TESTSUITE CASE XtSetMappedWhenManaged 2"
-	/tset/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged
+	/Xt5/XtSetMappedWhenManaged/XtSetMappedWhenManaged
 
 XtMapWidget
 	"VSW5TESTSUITE CASE XtMapWidget 2"
-	/tset/Xt5/XtMapWidget/XtMapWidget
+	/Xt5/XtMapWidget/XtMapWidget
 
 XtUnmapWidget
 	"VSW5TESTSUITE CASE XtUnmapWidget 2"
-	/tset/Xt5/XtUnmapWidget/XtUnmapWidget
+	/Xt5/XtUnmapWidget/XtUnmapWidget
 
 #Discrete tests for Xt Chapter 6
 
 ShellWidget
 	"VSW5TESTSUITE CASE ShellWidget 11"
-	/tset/Xt6/ShellWidget/ShellWidget
+	/Xt6/ShellWidget/ShellWidget
 
 OverrideShellWidget
 	"VSW5TESTSUITE CASE OverrideShellWidget 10"
-	/tset/Xt6/OverrideShellWidget/OverrideShellWidget
+	/Xt6/OverrideShellWidget/OverrideShellWidget
 
 WMShellWidget
 	"VSW5TESTSUITE CASE WMShellWidget 10"
-	/tset/Xt6/WMShellWidget/WMShellWidget
+	/Xt6/WMShellWidget/WMShellWidget
 
 VendorShellWidget
 	"VSW5TESTSUITE CASE VendorShellWidget 10"
-	/tset/Xt6/VendorShellWidget/VendorShellWidget
+	/Xt6/VendorShellWidget/VendorShellWidget
 
 TransientShellWidgets
 	"VSW5TESTSUITE CASE TransientShellWidgets 10"
-	/tset/Xt6/TransientShellWidget/TransientShellWidget
+	/Xt6/TransientShellWidget/TransientShellWidget
 
 TopLevelShellWidgets
 	"VSW5TESTSUITE CASE TopLevelShellWidgets 10"
-	/tset/Xt6/TopLevelShellWidget/TopLevelShellWidget
+	/Xt6/TopLevelShellWidget/TopLevelShellWidget
 
 ApplicationShellWidget
 	"VSW5TESTSUITE CASE ApplicationShellWidget 10"
-	/tset/Xt6/ApplicationShellWidget/ApplicationShellWidget
+	/Xt6/ApplicationShellWidget/ApplicationShellWidget
 
 #Discrete tests for Xt Chapter 7
 
 XtCreatePopupShell
 	"VSW5TESTSUITE CASE XtCreatePopupShell 8"
-	/tset/Xt7/XtCreatePopupShell/XtCreatePopupShell
+	/Xt7/XtCreatePopupShell/XtCreatePopupShell
 
 XtVaCreatePopupShell
 	"VSW5TESTSUITE CASE XtVaCreatePopupShell 8"
-	/tset/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell
+	/Xt7/XtVaCreatePopupShell/XtVaCreatePopupShell
 
 XtPopup
 	"VSW5TESTSUITE CASE XtPopup 11"
-	/tset/Xt7/XtPopup/XtPopup
+	/Xt7/XtPopup/XtPopup
 
 XtPopdown
 	"VSW5TESTSUITE CASE XtPopdown 8"
-	/tset/Xt7/XtPopdown/XtPopdown
+	/Xt7/XtPopdown/XtPopdown
 
 XtPopupSpringLoaded
 	"VSW5TESTSUITE CASE XtPopupSpringLoaded 9"
-	/tset/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded
+	/Xt7/XtPopupSpringLoaded/XtPopupSpringLoaded
 
 XtCallbackNone
 	"VSW5TESTSUITE CASE XtCallbackNone 8"
-	/tset/Xt7/XtCallbackNone/XtCallbackNone
+	/Xt7/XtCallbackNone/XtCallbackNone
 
 XtCallbackNonexclusive
 	"VSW5TESTSUITE CASE XtCallbackNonexclusive 8"
-	/tset/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive
+	/Xt7/XtCallbackNonexclusive/XtCallbackNonexclusive
 
 XtCallbackExclusive
 	"VSW5TESTSUITE CASE XtCallbackExclusive 8"
-	/tset/Xt7/XtCallbackExclusive/XtCallbackExclusive
+	/Xt7/XtCallbackExclusive/XtCallbackExclusive
 
 XtMenuPopup
 	"VSW5TESTSUITE CASE XtMenuPopup 22"
-	/tset/Xt7/XtMenuPopup/XtMenuPopup
+	/Xt7/XtMenuPopup/XtMenuPopup
 
 XtCallbackPopdown
 	"VSW5TESTSUITE CASE XtCallbackPopdown 9"
-	/tset/Xt7/XtCallbackPopdown/XtCallbackPopdown
+	/Xt7/XtCallbackPopdown/XtCallbackPopdown
 
 XtMenuPopdown
 	"VSW5TESTSUITE CASE XtMenuPopdown 11"
-	/tset/Xt7/XtMenuPopdown/XtMenuPopdown
+	/Xt7/XtMenuPopdown/XtMenuPopdown
 
 #Discrete tests for Xt Chapter 8
 
 XtMakeGeometryRequest
 	"VSW5TESTSUITE CASE XtMakeGeometryRequest 11"
-	/tset/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest
+	/Xt8/XtMakeGeometryRequest/XtMakeGeometryRequest
 
 XtMakeResizeRequest
 	"VSW5TESTSUITE CASE XtMakeResizeRequest 12"
-	/tset/Xt8/XtMakeResizeRequest/XtMakeResizeRequest
+	/Xt8/XtMakeResizeRequest/XtMakeResizeRequest
 
 XtMoveWidget
 	"VSW5TESTSUITE CASE XtMoveWidget 3"
-	/tset/Xt8/XtMoveWidget/XtMoveWidget
+	/Xt8/XtMoveWidget/XtMoveWidget
 
 XtResizeWidget
 	"VSW5TESTSUITE CASE XtResizeWidget 4"
-	/tset/Xt8/XtResizeWidget/XtResizeWidget
+	/Xt8/XtResizeWidget/XtResizeWidget
 
 XtConfigureWidget
 	"VSW5TESTSUITE CASE XtConfigureWidget 5"
-	/tset/Xt8/XtConfigureWidget/XtConfigureWidget
+	/Xt8/XtConfigureWidget/XtConfigureWidget
 
 XtResizeWindow
 	"VSW5TESTSUITE CASE XtResizeWindow 2"
-	/tset/Xt8/XtResizeWindow/XtResizeWindow
+	/Xt8/XtResizeWindow/XtResizeWindow
 
 XtQueryGeometry
 	"VSW5TESTSUITE CASE XtQueryGeometry 6"
-	/tset/Xt8/XtQueryGeometry/XtQueryGeometry
+	/Xt8/XtQueryGeometry/XtQueryGeometry
 
 #Discrete tests for Xt Chapter 9
 
 XtAppAddInput
 	"VSW5TESTSUITE CASE XtAppAddInput 5"
-	/tset/Xt9/XtAppAddInput/XtAppAddInput
+	/Xt9/XtAppAddInput/XtAppAddInput
 
 XtRemoveInput
 	"VSW5TESTSUITE CASE XtRemoveInput 1"
-	/tset/Xt9/XtRemoveInput/XtRemoveInput
+	/Xt9/XtRemoveInput/XtRemoveInput
 
 XtAppAddTimeOut
 	"VSW5TESTSUITE CASE XtAppAddTimeOut 3"
-	/tset/Xt9/XtAppAddTimeOut/XtAppAddTimeOut
+	/Xt9/XtAppAddTimeOut/XtAppAddTimeOut
 
 XtRemoveTimeOut
 	"VSW5TESTSUITE CASE XtRemoveTimeOut 1"
-	/tset/Xt9/XtRemoveTimeOut/XtRemoveTimeOut
+	/Xt9/XtRemoveTimeOut/XtRemoveTimeOut
 
 XtAddGrab
 	"VSW5TESTSUITE CASE XtAddGrab 5"
-	/tset/Xt9/XtAddGrab/XtAddGrab
+	/Xt9/XtAddGrab/XtAddGrab
 
 XtRemoveGrab
 	"VSW5TESTSUITE CASE XtRemoveGrab 2"
-	/tset/Xt9/XtRemoveGrab/XtRemoveGrab
+	/Xt9/XtRemoveGrab/XtRemoveGrab
 
 XtGrabKey
 	"VSW5TESTSUITE CASE XtGrabKey 5"
-	/tset/Xt9/XtGrabKey/XtGrabKey
+	/Xt9/XtGrabKey/XtGrabKey
 
 XtUngrabKey
 	"VSW5TESTSUITE CASE XtUngrabKey 2"
-	/tset/Xt9/XtUngrabKey/XtUngrabKey
+	/Xt9/XtUngrabKey/XtUngrabKey
 
 XtGrabKeyboard
 	"VSW5TESTSUITE CASE XtGrabKeyboard 2"
-	/tset/Xt9/XtGrabKeyboard/XtGrabKeyboard
+	/Xt9/XtGrabKeyboard/XtGrabKeyboard
 
 XtUngrabKeyboard
 	"VSW5TESTSUITE CASE XtUngrabKeyboard 1"
-	/tset/Xt9/XtUngrabKeyboard/XtUngrabKeyboard
+	/Xt9/XtUngrabKeyboard/XtUngrabKeyboard
 
 XtGrabButton
 	"VSW5TESTSUITE CASE XtGrabButton 5"
-	/tset/Xt9/XtGrabButton/XtGrabButton
+	/Xt9/XtGrabButton/XtGrabButton
 
 XtUngrabButton
 	"VSW5TESTSUITE CASE XtUngrabButton 2"
-	/tset/Xt9/XtGrabButton/XtGrabButton
+	/Xt9/XtGrabButton/XtGrabButton
 
 XtGrabPointer
 	"VSW5TESTSUITE CASE XtGrabPointer 2"
-	/tset/Xt9/XtGrabPointer/XtGrabPointer
+	/Xt9/XtGrabPointer/XtGrabPointer
 
 XtUngrabPointer
 	"VSW5TESTSUITE CASE XtUngrabPointer 1"
-	/tset/Xt9/XtUngrabPointer/XtUngrabPointer
+	/Xt9/XtUngrabPointer/XtUngrabPointer
 
 XtSetKeyboardFocus
 	"VSW5TESTSUITE CASE XtSetKeyboardFocus 17"
-	/tset/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus
+	/Xt9/XtSetKeyboardFocus/XtSetKeyboardFocus
 
 XtCallAcceptFocus
 	"VSW5TESTSUITE CASE XtCallAcceptFocus 2"
-	/tset/Xt9/XtCallAcceptFocus/XtCallAcceptFocus
+	/Xt9/XtCallAcceptFocus/XtCallAcceptFocus
 
 XtAppPending
 	"VSW5TESTSUITE CASE XtAppPending 5"
-	/tset/Xt9/XtAppPending/XtAppPending
+	/Xt9/XtAppPending/XtAppPending
 
 XtAppPeekEvent
 	"VSW5TESTSUITE CASE XtAppPeekEvent 3"
-	/tset/Xt9/XtAppPeekEvent/XtAppPeekEvent
+	/Xt9/XtAppPeekEvent/XtAppPeekEvent
 
 XtAppNextEvent
 	"VSW5TESTSUITE CASE XtAppNextEvent 4"
-	/tset/Xt9/XtAppNextEvent/XtAppNextEvent
+	/Xt9/XtAppNextEvent/XtAppNextEvent
 
 XtAppProcessEvent
 	"VSW5TESTSUITE CASE XtAppProcessEvent 11"
-	/tset/Xt9/XtAppProcessEvent/XtAppProcessEvent
+	/Xt9/XtAppProcessEvent/XtAppProcessEvent
 
 XtDispatchEvent
 	"VSW5TESTSUITE CASE XtDispatchEvent 11"
-	/tset/Xt9/XtDispatchEvent/XtDispatchEvent
+	/Xt9/XtDispatchEvent/XtDispatchEvent
 
 XtAppMainLoop
 	"VSW5TESTSUITE CASE XtAppMainLoop 28"
-	/tset/Xt9/XtAppMainLoop/XtAppMainLoop
+	/Xt9/XtAppMainLoop/XtAppMainLoop
 
 XtIsSensitive
 	"VSW5TESTSUITE CASE XtIsSensitive 4"
-	/tset/Xt9/XtIsSensitive/XtIsSensitive
+	/Xt9/XtIsSensitive/XtIsSensitive
 
 XtSetSensitive
 	"VSW5TESTSUITE CASE XtSetSensitive 6"
-	/tset/Xt9/XtSetSensitive/XtSetSensitive
+	/Xt9/XtSetSensitive/XtSetSensitive
 
 XtAppAddWorkProc
 	"VSW5TESTSUITE CASE XtAppAddWorkProc 5"
-	/tset/Xt9/XtAppAddWorkProc/XtAppAddWorkProc
+	/Xt9/XtAppAddWorkProc/XtAppAddWorkProc
 
 XtRemoveWorkProc
 	"VSW5TESTSUITE CASE XtRemoveWorkProc 2"
-	/tset/Xt9/XtRemoveWorkProc/XtRemoveWorkProc
+	/Xt9/XtRemoveWorkProc/XtRemoveWorkProc
 
 XtAddEventHandler
 	"VSW5TESTSUITE CASE XtAddEventHandler 8"
-	/tset/Xt9/XtAddEventHandler/XtAddEventHandler
+	/Xt9/XtAddEventHandler/XtAddEventHandler
 
 XtRemoveEventHandler
 	"VSW5TESTSUITE CASE XtRemoveEventHandler 7"
-	/tset/Xt9/XtRemoveEventHandler/XtRemoveEventHandler
+	/Xt9/XtRemoveEventHandler/XtRemoveEventHandler
 
 XtInsertEventHandler
 	"VSW5TESTSUITE CASE XtInsertEventHandler 10"
-	/tset/Xt9/XtInsertEventHandler/XtInsertEventHandler
+	/Xt9/XtInsertEventHandler/XtInsertEventHandler
 
 XtAddRawEventHandler
 	"VSW5TESTSUITE CASE XtAddRawEventHandler 9"
-	/tset/Xt9/XtAddRawEventHandler/XtAddRawEventHandler
+	/Xt9/XtAddRawEventHandler/XtAddRawEventHandler
 
 XtRemoveRawEventHandler
 	"VSW5TESTSUITE CASE XtRemoveRawEventHandler 7"
-	/tset/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler
+	/Xt9/XtRemoveRawEventHandler/XtRemoveRawEventHandler
 
 XtInsertRawEventHandler
 	"VSW5TESTSUITE CASE XtInsertRawEventHandler 10"
-	/tset/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler
+	/Xt9/XtInsertRawEventHandler/XtInsertRawEventHandler
 
 XtBuildEventMask
 	"VSW5TESTSUITE CASE XtBuildEventMask 3"
-	/tset/Xt9/XtBuildEventMask/XtBuildEventMask
+	/Xt9/XtBuildEventMask/XtBuildEventMask
 
 #Discrete tests for Xt Chapter 10
 
 XtAddCallback
 	"VSW5TESTSUITE CASE XtAddCallback 3"
-	/tset/Xt10/XtAddCallback/XtAddCallback
+	/Xt10/XtAddCallback/XtAddCallback
 
 XtAddCallbacks
 	"VSW5TESTSUITE CASE XtAddCallbacks 3"
-	/tset/Xt10/XtAddCallbacks/XtAddCallbacks
+	/Xt10/XtAddCallbacks/XtAddCallbacks
 
 XtRemoveCallback
 	"VSW5TESTSUITE CASE XtRemoveCallback 2"
-	/tset/Xt10/XtRemoveCallback/XtRemoveCallback
+	/Xt10/XtRemoveCallback/XtRemoveCallback
 
 XtRemoveCallbacks
 	"VSW5TESTSUITE CASE XtRemoveCallbacks 1"
-	/tset/Xt10/XtRemoveCallbacks/XtRemoveCallbacks
+	/Xt10/XtRemoveCallbacks/XtRemoveCallbacks
 
 XtRemoveAllCallbacks
 	"VSW5TESTSUITE CASE XtRemoveAllCallbacks 2"
-	/tset/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks
+	/Xt10/XtRemoveAllCallbacks/XtRemoveAllCallbacks
 
 XtCallCallbacks
 	"VSW5TESTSUITE CASE XtCallCallbacks 1"
-	/tset/Xt10/XtCallCallbacks/XtCallCallbacks
+	/Xt10/XtCallCallbacks/XtCallCallbacks
 
 XtCallCallbackList
 	"VSW5TESTSUITE CASE XtCallCallbackList 2"
-	/tset/Xt10/XtCallCallbackList/XtCallCallbackList
+	/Xt10/XtCallCallbackList/XtCallCallbackList
 
 XtHasCallbacks
 	"VSW5TESTSUITE CASE XtHasCallbacks 3"
-	/tset/Xt10/XtHasCallbacks/XtHasCallbacks
+	/Xt10/XtHasCallbacks/XtHasCallbacks
 
 
 #Discrete tests for Xt Chapter 11
 
 XtGetResourceList
 	"VSW5TESTSUITE CASE XtGetResourceList 2"
-	/tset/Xt11/XtGetResourceList/XtGetResourceList
+	/Xt11/XtGetResourceList/XtGetResourceList
 
 XtGetConstraintResourceList
 	"VSW5TESTSUITE CASE XtGetConstraintResourceList 3"
-	/tset/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList
+	/Xt11/XtGetConstraintResourceList/XtGetConstraintResourceList
 
 XtOffsetOf
 	"VSW5TESTSUITE CASE XtOffsetOf 1"
-	/tset/Xt11/XtOffsetOf/XtOffsetOf
+	/Xt11/XtOffsetOf/XtOffsetOf
 
 XtOffset
 	"VSW5TESTSUITE CASE XtOffset 1"
-	/tset/Xt11/XtOffset/XtOffset
+	/Xt11/XtOffset/XtOffset
 
 XtGetSubresources
 	"VSW5TESTSUITE CASE XtGetSubresources 2"
-	/tset/Xt11/XtGetSubresources/XtGetSubresources
+	/Xt11/XtGetSubresources/XtGetSubresources
 
 XtVaGetSubresources
 	"VSW5TESTSUITE CASE XtVaGetSubresources 4"
-	/tset/Xt11/XtVaGetSubresources/XtVaGetSubresources
+	/Xt11/XtVaGetSubresources/XtVaGetSubresources
 
 XtGetApplicationResources
 	"VSW5TESTSUITE CASE XtGetApplicationResources 2"
-	/tset/Xt11/XtGetApplicationResources/XtGetApplicationResources
+	/Xt11/XtGetApplicationResources/XtGetApplicationResources
 
 XtVaGetApplicationResources
 	"VSW5TESTSUITE CASE XtVaGetApplicationResources 4"
-	/tset/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources
+	/Xt11/XtVaGetApplicationResources/XtVaGetApplicationResources
 
 XtCvtStringToAcceleratorTable
 	"VSW5TESTSUITE CASE XtCvtStringToAcceleratorTable 4"
-	/tset/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable
+	/Xt11/XtCvtStringToAcceleratorTable/XtCvtStringToAcceleratorTable
 
 XtCvtStringToAtom
 	"VSW5TESTSUITE CASE XtCvtStringToAtom 4"
-	/tset/Xt11/XtCvtStringToAtom/XtCvtStringToAtom
+	/Xt11/XtCvtStringToAtom/XtCvtStringToAtom
 
 XtCvtStringToBoolean
 	"VSW5TESTSUITE CASE XtCvtStringToBoolean 4"
-	/tset/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean
+	/Xt11/XtCvtStringToBoolean/XtCvtStringToBoolean
 
 XtCvtStringToBool
 	"VSW5TESTSUITE CASE XtCvtStringToBool 4"
-	/tset/Xt11/XtCvtStringToBool/XtCvtStringToBool
+	/Xt11/XtCvtStringToBool/XtCvtStringToBool
 
 XtCvtStringToCursor
 	"VSW5TESTSUITE CASE XtCvtStringToCursor 5"
-	/tset/Xt11/XtCvtStringToCursor/XtCvtStringToCursor
+	/Xt11/XtCvtStringToCursor/XtCvtStringToCursor
 
 XtCvtStringToDimension
 	"VSW5TESTSUITE CASE XtCvtStringToDimension 4"
-	/tset/Xt11/XtCvtStringToDimension/XtCvtStringToDimension
+	/Xt11/XtCvtStringToDimension/XtCvtStringToDimension
 
 XtCvtStringToDisplay
 	"VSW5TESTSUITE CASE XtCvtStringToDisplay 4"
-	/tset/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay
+	/Xt11/XtCvtStringToDisplay/XtCvtStringToDisplay
 
 XtCvtStringToFile
 	"VSW5TESTSUITE CASE XtCvtStringToFile 4"
-	/tset/Xt11/XtCvtStringToFile/XtCvtStringToFile
+	/Xt11/XtCvtStringToFile/XtCvtStringToFile
 
 XtCvtStringToFloat
 	"VSW5TESTSUITE CASE XtCvtStringToFloat 4"
-	/tset/Xt11/XtCvtStringToFloat/XtCvtStringToFloat
+	/Xt11/XtCvtStringToFloat/XtCvtStringToFloat
 
 XtCvtStringToFont
 	"VSW5TESTSUITE CASE XtCvtStringToFont 8"
-	/tset/Xt11/XtCvtStringToFont/XtCvtStringToFont
+	/Xt11/XtCvtStringToFont/XtCvtStringToFont
 
 XtCvtStringToFontSet
 	"VSW5TESTSUITE CASE XtCvtStringToFontSet 11"
-	/tset/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet
+	/Xt11/XtCvtStringToFontSet/XtCvtStringToFontSet
 
 XtCvtStringToFontStruct
 	"VSW5TESTSUITE CASE XtCvtStringToFontStruct 8"
-	/tset/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct
+	/Xt11/XtCvtStringToFontStruct/XtCvtStringToFontStruct
 
 XtCvtStringToInitialState
 	"VSW5TESTSUITE CASE XtCvtStringToInitialState 6"
-	/tset/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState
+	/Xt11/XtCvtStringToInitialState/XtCvtStringToInitialState
 
 XtCvtStringToInt
 	"VSW5TESTSUITE CASE XtCvtStringToInt 4"
-	/tset/Xt11/XtCvtStringToInt/XtCvtStringToInt
+	/Xt11/XtCvtStringToInt/XtCvtStringToInt
 
 XtCvtStringToPixel
 	"VSW5TESTSUITE CASE XtCvtStringToPixel 9"
-	/tset/Xt11/XtCvtStringToPixel/XtCvtStringToPixel
+	/Xt11/XtCvtStringToPixel/XtCvtStringToPixel
 
 XtCvtStringToShort
 	"VSW5TESTSUITE CASE XtCvtStringToShort 4"
-	/tset/Xt11/XtCvtStringToShort/XtCvtStringToShort
+	/Xt11/XtCvtStringToShort/XtCvtStringToShort
 
 XtCvtStringToTranslationTable
 	"VSW5TESTSUITE CASE XtCvtStringToTranslationTable 4"
-	/tset/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable
+	/Xt11/XtCvtStringToTranslationTable/XtCvtStringToTranslationTable
 
 XtCvtStringToPosition
 	"VSW5TESTSUITE CASE XtCvtStringToPosition 4"
-	/tset/Xt11/XtCvtStringToPosition/XtCvtStringToPosition
+	/Xt11/XtCvtStringToPosition/XtCvtStringToPosition
 
 XtCvtStringToUnsignedChar
 	"VSW5TESTSUITE CASE XtCvtStringToUnsignedChar 4"
-	/tset/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar
+	/Xt11/XtCvtStringToUnsignedChar/XtCvtStringToUnsignedChar
 
 XtCvtStringToVisual
 	"VSW5TESTSUITE CASE XtCvtStringToVisual 5"
-	/tset/Xt11/XtCvtStringToVisual/XtCvtStringToVisual
+	/Xt11/XtCvtStringToVisual/XtCvtStringToVisual
 
 XtCvtColorToPixel
 	"VSW5TESTSUITE CASE XtCvtColorToPixel 3"
-	/tset/Xt11/XtCvtColorToPixel/XtCvtColorToPixel
+	/Xt11/XtCvtColorToPixel/XtCvtColorToPixel
 
 XtCvtIntToBoolean
 	"VSW5TESTSUITE CASE XtCvtIntToBoolean 3"
-	/tset/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean
+	/Xt11/XtCvtIntToBoolean/XtCvtIntToBoolean
 
 XtCvtIntToBool
 	"VSW5TESTSUITE CASE XtCvtIntToBool 3"
-	/tset/Xt11/XtCvtIntToBool/XtCvtIntToBool
+	/Xt11/XtCvtIntToBool/XtCvtIntToBool
 
 XtCvtIntToColor
 	"VSW5TESTSUITE CASE XtCvtIntToColor 4"
-	/tset/Xt11/XtCvtIntToColor/XtCvtIntToColor
+	/Xt11/XtCvtIntToColor/XtCvtIntToColor
 
 XtCvtIntToDimension
 	"VSW5TESTSUITE CASE XtCvtIntToDimension 3"
-	/tset/Xt11/XtCvtIntToDimension/XtCvtIntToDimension
+	/Xt11/XtCvtIntToDimension/XtCvtIntToDimension
 
 XtCvtIntToFloat
 	"VSW5TESTSUITE CASE XtCvtIntToFloat 3"
-	/tset/Xt11/XtCvtIntToFloat/XtCvtIntToFloat
+	/Xt11/XtCvtIntToFloat/XtCvtIntToFloat
 
 XtCvtIntToFont
 	"VSW5TESTSUITE CASE XtCvtIntToFont 3"
-	/tset/Xt11/XtCvtIntToFont/XtCvtIntToFont
+	/Xt11/XtCvtIntToFont/XtCvtIntToFont
 
 XtCvtIntToPixel
 	"VSW5TESTSUITE CASE XtCvtIntToPixel 3"
-	/tset/Xt11/XtCvtIntToPixel/XtCvtIntToPixel
+	/Xt11/XtCvtIntToPixel/XtCvtIntToPixel
 
 XtCvtIntToPixmap
 	"VSW5TESTSUITE CASE XtCvtIntToPixmap 3"
-	/tset/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap
+	/Xt11/XtCvtIntToPixmap/XtCvtIntToPixmap
 
 XtCvtIntToPosition
 	"VSW5TESTSUITE CASE XtCvtIntToPosition 3"
-	/tset/Xt11/XtCvtIntToPosition/XtCvtIntToPosition
+	/Xt11/XtCvtIntToPosition/XtCvtIntToPosition
 
 XtCvtIntToShort
 	"VSW5TESTSUITE CASE XtCvtIntToShort 3"
-	/tset/Xt11/XtCvtIntToShort/XtCvtIntToShort
+	/Xt11/XtCvtIntToShort/XtCvtIntToShort
 
 XtCvtIntToUnsignedChar
 	"VSW5TESTSUITE CASE XtCvtIntToUnsignedChar 3"
-	/tset/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar
+	/Xt11/XtCvtIntToUnsignedChar/XtCvtIntToUnsignedChar
 
 XtCvtPixelToColor
 	"VSW5TESTSUITE CASE XtCvtPixelToColor 3"
-	/tset/Xt11/XtCvtPixelToColor/XtCvtPixelToColor
+	/Xt11/XtCvtPixelToColor/XtCvtPixelToColor
 
 XtDisplayStringConversionWarn
 	"VSW5TESTSUITE CASE XtDisplayStringConversionWarning 2"
-	/tset/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning
+	/Xt11/XtDisplayStringConversionWarning/XtDisplayStringConversionWarning
 
 XtDisplayToApplicationContext
 	"VSW5TESTSUITE CASE XtDisplayToApplicationContext 2"
-	/tset/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext
+	/Xt11/XtDisplayToApplicationContext/XtDisplayToApplicationContext
 
 XtSetTypeConverter
 	"VSW5TESTSUITE CASE XtSetTypeConverter 15"
-	/tset/Xt11/XtSetTypeConverter/XtSetTypeConverter
+	/Xt11/XtSetTypeConverter/XtSetTypeConverter
 
 XtAppSetTypeConverter
 	"VSW5TESTSUITE CASE XtAppSetTypeConverter 15"
-	/tset/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter
+	/Xt11/XtAppSetTypeConverter/XtAppSetTypeConverter
 
 XtCallConverter
 	"VSW5TESTSUITE CASE XtCallConverter 15"
-	/tset/Xt11/XtCallConverter/XtCallConverter
+	/Xt11/XtCallConverter/XtCallConverter
 
 XtAppReleaseCacheRefs
 	"VSW5TESTSUITE CASE XtAppReleaseCacheRefs 2"
-	/tset/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs
+	/Xt11/XtAppReleaseCacheRefs/XtAppReleaseCacheRefs
 
 XtCallbackReleaseCacheRef
 	"VSW5TESTSUITE CASE XtCallbackReleaseCacheRef 1"
-	/tset/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef
+	/Xt11/XtCallbackReleaseCacheRef/XtCallbackReleaseCacheRef
 
 XtCallbackReleaseCacheRefList
 	"VSW5TESTSUITE CASE XtCallbackReleaseCacheRefList 1"
-	/tset/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList
+	/Xt11/XtCallbackReleaseCacheRefList/XtCallbackReleaseCacheRefList
 
 XtConvertAndStore
 	"VSW5TESTSUITE CASE XtConvertAndStore 18"
-	/tset/Xt11/XtConvertAndStore/XtConvertAndStore
+	/Xt11/XtConvertAndStore/XtConvertAndStore
 
 XtGetValues
 	"VSW5TESTSUITE CASE XtGetValues 5"
-	/tset/Xt11/XtGetValues/XtGetValues
+	/Xt11/XtGetValues/XtGetValues
 
 XtVaGetValues
 	"VSW5TESTSUITE CASE XtVaGetValues 7"
-	/tset/Xt11/XtVaGetValues/XtVaGetValues
+	/Xt11/XtVaGetValues/XtVaGetValues
 
 XtGetSubvalues
 	"VSW5TESTSUITE CASE XtGetSubvalues 2"
-	/tset/Xt11/XtGetSubvalues/XtGetSubvalues
+	/Xt11/XtGetSubvalues/XtGetSubvalues
 
 XtVaGetSubvalues
 	"VSW5TESTSUITE CASE XtVaGetSubvalues 3"
-	/tset/Xt11/XtVaGetSubvalues/XtVaGetSubvalues
+	/Xt11/XtVaGetSubvalues/XtVaGetSubvalues
 
 XtSetValues
 	"VSW5TESTSUITE CASE XtSetValues 13"
-	/tset/Xt11/XtSetValues/XtSetValues
+	/Xt11/XtSetValues/XtSetValues
 
 XtVaSetValues
 	"VSW5TESTSUITE CASE XtVaSetValues 15"
-	/tset/Xt11/XtVaSetValues/XtVaSetValues
+	/Xt11/XtVaSetValues/XtVaSetValues
 
 XtSetSubvalues
 	"VSW5TESTSUITE CASE XtSetSubvalues 2"
-	/tset/Xt11/XtSetSubvalues/XtSetSubvalues
+	/Xt11/XtSetSubvalues/XtSetSubvalues
 
 XtVaSetSubvalues
 	"VSW5TESTSUITE CASE XtVaSetSubvalues 4"
-	/tset/Xt11/XtVaSetSubvalues/XtVaSetSubvalues
+	/Xt11/XtVaSetSubvalues/XtVaSetSubvalues
 
 #Discrete tests for Xt Chapter 12
 
 XtAppAddActions
 	"VSW5TESTSUITE CASE XtAppAddActions 4"
-	/tset/Xt12/XtAppAddActions/XtAppAddActions
+	/Xt12/XtAppAddActions/XtAppAddActions
 
 XtAppAddActionHook
 	"VSW5TESTSUITE CASE XtAppAddActionHook 6"
-	/tset/Xt12/XtAppAddActionHook/XtAppAddActionHook
+	/Xt12/XtAppAddActionHook/XtAppAddActionHook
 
 XtRemoveActionHook
 	"VSW5TESTSUITE CASE XtRemoveActionHook 1"
-	/tset/Xt12/XtRemoveActionHook/XtRemoveActionHook
+	/Xt12/XtRemoveActionHook/XtRemoveActionHook
 
 XtSetMultiClickTime
 	"VSW5TESTSUITE CASE XtSetMultiClickTime 1"
-	/tset/Xt12/XtSetMultiClickTime/XtSetMultiClickTime
+	/Xt12/XtSetMultiClickTime/XtSetMultiClickTime
 
 XtGetMultiClickTime
 	"VSW5TESTSUITE CASE XtGetMultiClickTime 2"
-	/tset/Xt12/XtGetMultiClickTime/XtGetMultiClickTime
+	/Xt12/XtGetMultiClickTime/XtGetMultiClickTime
 
 XtParseTranslationTable
 	"VSW5TESTSUITE CASE XtParseTranslationTable 1"
-	/tset/Xt12/XtParseTranslationTable/XtParseTranslationTable
+	/Xt12/XtParseTranslationTable/XtParseTranslationTable
 
 XtAugmentTranslations
 	"VSW5TESTSUITE CASE XtAugmentTranslations 4"
-	/tset/Xt12/XtAugmentTranslations/XtAugmentTranslations
+	/Xt12/XtAugmentTranslations/XtAugmentTranslations
 
 XtOverrideTranslations
 	"VSW5TESTSUITE CASE XtOverrideTranslations 4"
-	/tset/Xt12/XtOverrideTranslations/XtOverrideTranslations
+	/Xt12/XtOverrideTranslations/XtOverrideTranslations
 
 XtUninstallTranslations
 	"VSW5TESTSUITE CASE XtUninstallTranslations 1"
-	/tset/Xt12/XtUninstallTranslations/XtUninstallTranslations
+	/Xt12/XtUninstallTranslations/XtUninstallTranslations
 
 XtParseAcceleratorTable
 	"VSW5TESTSUITE CASE XtParseAcceleratorTable 1"
-	/tset/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable
+	/Xt12/XtParseAcceleratorTable/XtParseAcceleratorTable
 
 XtInstallAccelerators
 	"VSW5TESTSUITE CASE XtInstallAccelerators 2"
-	/tset/Xt12/XtInstallAccelerators/XtInstallAccelerators
+	/Xt12/XtInstallAccelerators/XtInstallAccelerators
 
 XtInstallAllAccelerators
 	"VSW5TESTSUITE CASE XtInstallAllAccelerators 1"
-	/tset/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators
+	/Xt12/XtInstallAllAccelerators/XtInstallAllAccelerators
 
 XtGetKeysymTable
 	"VSW5TESTSUITE CASE XtGetKeysymTable 4"
-	/tset/Xt12/XtGetKeysymTable/XtGetKeysymTable
+	/Xt12/XtGetKeysymTable/XtGetKeysymTable
 
 XtSetKeyTranslator
 	"VSW5TESTSUITE CASE XtSetKeyTranslator 1"
-	/tset/Xt12/XtSetKeyTranslator/XtSetKeyTranslator
+	/Xt12/XtSetKeyTranslator/XtSetKeyTranslator
 
 XtTranslateKeycode
 	"VSW5TESTSUITE CASE XtTranslateKeycode 2"
-	/tset/Xt12/XtTranslateKeycode/XtTranslateKeycode
+	/Xt12/XtTranslateKeycode/XtTranslateKeycode
 
 XtRegisterCaseConverter
 	"VSW5TESTSUITE CASE XtRegisterCaseConverter 2"
-	/tset/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter
+	/Xt12/XtRegisterCaseConverter/XtRegisterCaseConverter
 
 XtConvertCase
 	"VSW5TESTSUITE CASE XtConvertCase 2"
-	/tset/Xt12/XtConvertCase/XtConvertCase
+	/Xt12/XtConvertCase/XtConvertCase
 
 XtGetActionKeysym
 	"VSW5TESTSUITE CASE XtGetActionKeysym 8"
-	/tset/Xt12/XtGetActionKeysym/XtGetActionKeysym
+	/Xt12/XtGetActionKeysym/XtGetActionKeysym
 
 XtKeysymToKeycodeList
 	"VSW5TESTSUITE CASE XtKeysymToKeycodeList 2"
-	/tset/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList
+	/Xt12/XtKeysymToKeycodeList/XtKeysymToKeycodeList
 
 XtRegisterGrabAction
 	"VSW5TESTSUITE CASE XtRegisterGrabAction 11"
-	/tset/Xt12/XtRegisterGrabAction/XtRegisterGrabAction
+	/Xt12/XtRegisterGrabAction/XtRegisterGrabAction
 
 XtCallActionProc
 	"VSW5TESTSUITE CASE XtCallActionProc 2"
-	/tset/Xt12/XtCallActionProc/XtCallActionProc
+	/Xt12/XtCallActionProc/XtCallActionProc
 
 XtGetActionList
 	"VSW5TESTSUITE CASE XtGetActionList 5"
-	/tset/Xt12/XtGetActionList/XtGetActionList
+	/Xt12/XtGetActionList/XtGetActionList
 
 #Discrete tests for Xt Chapter 13
 
 XtNumber
 	"VSW5TESTSUITE CASE XtNumber 1"
-	/tset/Xt13/XtNumber/XtNumber
+	/Xt13/XtNumber/XtNumber
 
 XtNameToWidget
 	"VSW5TESTSUITE CASE XtNameToWidget 7"
-	/tset/Xt13/XtNameToWidget/XtNameToWidget
+	/Xt13/XtNameToWidget/XtNameToWidget
 
 XtMalloc
 	"VSW5TESTSUITE CASE XtMalloc 6"
-	/tset/Xt13/XtMalloc/XtMalloc
+	/Xt13/XtMalloc/XtMalloc
 
 XtCalloc
 	"VSW5TESTSUITE CASE XtCalloc 6"
-	/tset/Xt13/XtCalloc/XtCalloc
+	/Xt13/XtCalloc/XtCalloc
 
 XtRealloc
 	"VSW5TESTSUITE CASE XtRealloc 12"
-	/tset/Xt13/XtRealloc/XtRealloc
+	/Xt13/XtRealloc/XtRealloc
 
 XtFree
 	"VSW5TESTSUITE CASE XtFree 4"
-	/tset/Xt13/XtFree/XtFree
+	/Xt13/XtFree/XtFree
 
 XtNew
 	"VSW5TESTSUITE CASE XtNew 5"
-	/tset/Xt13/XtNew/XtNew
+	/Xt13/XtNew/XtNew
 
 XtNewString
 	"VSW5TESTSUITE CASE XtNewString 5"
-	/tset/Xt13/XtNewString/XtNewString
+	/Xt13/XtNewString/XtNewString
 
 XtAllocateGC
 	"VSW5TESTSUITE CASE XtAllocateGC 9"
-	/tset/Xt13/XtAllocateGC/XtAllocateGC
+	/Xt13/XtAllocateGC/XtAllocateGC
 
 XtGetGC
 	"VSW5TESTSUITE CASE XtGetGC 4"
-	/tset/Xt13/XtGetGC/XtGetGC
+	/Xt13/XtGetGC/XtGetGC
 
 XtReleaseGC
 	"VSW5TESTSUITE CASE XtReleaseGC 2"
-	/tset/Xt13/XtReleaseGC/XtReleaseGC
+	/Xt13/XtReleaseGC/XtReleaseGC
 
 XtAppSetSelectionTimeout
 	"VSW5TESTSUITE CASE XtAppSetSelectionTimeout 1"
-	/tset/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout
+	/Xt13/XtAppSetSelectionTimeout/XtAppSetSelectionTimeout
 
 XtAppGetSelectionTimeout
 	"VSW5TESTSUITE CASE XtAppGetSelectionTimeout 2"
-	/tset/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout
+	/Xt13/XtAppGetSelectionTimeout/XtAppGetSelectionTimeout
 
 XtGetSelectionRequest
 	"VSW5TESTSUITE CASE XtGetSelectionRequest 3"
-	/tset/Xt13/XtGetSelectionRequest/XtGetSelectionRequest
+	/Xt13/XtGetSelectionRequest/XtGetSelectionRequest
 
 XtGetSelectionValue
 	"VSW5TESTSUITE CASE XtGetSelectionValue 4"
-	/tset/Xt13/XtGetSelectionValue/XtGetSelectionValue
+	/Xt13/XtGetSelectionValue/XtGetSelectionValue
 
 XtGetSelectionValues
 	"VSW5TESTSUITE CASE XtGetSelectionValues 5"
-	/tset/Xt13/XtGetSelectionValues/XtGetSelectionValues
+	/Xt13/XtGetSelectionValues/XtGetSelectionValues
 
 XtOwnSelection
 	"VSW5TESTSUITE CASE XtOwnSelection 8"
-	/tset/Xt13/XtOwnSelection/XtOwnSelection
+	/Xt13/XtOwnSelection/XtOwnSelection
 
 XtDisownSelection
 	"VSW5TESTSUITE CASE XtDisownSelection 5"
-	/tset/Xt13/XtDisownSelection/XtDisownSelection
+	/Xt13/XtDisownSelection/XtDisownSelection
 
 XtGetSelectionValueIncremental
 	"VSW5TESTSUITE CASE XtGetSelectionValueIncremental 6"
-	/tset/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental
+	/Xt13/XtGetSelectionValueIncremental/XtGetSelectionValueIncremental
 
 XtGetSelectionValuesIncremental
 	"VSW5TESTSUITE CASE XtGetSelectionValuesIncremental 7"
-	/tset/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental
+	/Xt13/XtGetSelectionValuesIncremental/XtGetSelectionValuesIncremental
 
 XtOwnSelectionIncremental
 	"VSW5TESTSUITE CASE XtOwnSelectionIncremental 10"
-	/tset/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental
+	/Xt13/XtOwnSelectionIncremental/XtOwnSelectionIncremental
 
 XtLastTimestampProcessed
 	"VSW5TESTSUITE CASE XtLastTimestampProcessed 2"
-	/tset/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed
+	/Xt13/XtLastTimestampProcessed/XtLastTimestampProcessed
 
 XtAddExposureToRegion
 	"VSW5TESTSUITE CASE XtAddExposureToRegion 3"
-	/tset/Xt13/XtAddExposureToRegion/XtAddExposureToRegion
+	/Xt13/XtAddExposureToRegion/XtAddExposureToRegion
 
 XtTranslateCoords
 	"VSW5TESTSUITE CASE XtTranslateCoords 1"
-	/tset/Xt13/XtTranslateCoords/XtTranslateCoords
+	/Xt13/XtTranslateCoords/XtTranslateCoords
 
 XtWindowToWidget
 	"VSW5TESTSUITE CASE XtWindowToWidget 2"
-	/tset/Xt13/XtWindowToWidget/XtWindowToWidget
+	/Xt13/XtWindowToWidget/XtWindowToWidget
 
 XtGetApplicationNameAndClass
 	"VSW5TESTSUITE CASE XtGetApplicationNameAndClass 3"
-	/tset/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass
+	/Xt13/XtGetApplicationNameAndClass/XtGetApplicationNameAndClass
 
 XtAppGetErrorDatabase
 	"VSW5TESTSUITE CASE XtAppGetErrorDatabase 1"
-	/tset/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase
+	/Xt13/XtAppGetErrorDatabase/XtAppGetErrorDatabase
 
 XtAppGetErrorDatabaseText
 	"VSW5TESTSUITE CASE XtAppGetErrorDatabaseText 4"
-	/tset/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText
+	/Xt13/XtAppGetErrorDatabaseText/XtAppGetErrorDatabaseText
 
 XtAppSetErrorMsgHandler
 	"VSW5TESTSUITE CASE XtAppSetErrorMsgHandler 2"
-	/tset/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler
+	/Xt13/XtAppSetErrorMsgHandler/XtAppSetErrorMsgHandler
 
 XtAppErrorMsg
 	"VSW5TESTSUITE CASE XtAppErrorMsg 3"
-	/tset/Xt13/XtAppErrorMsg/XtAppErrorMsg
+	/Xt13/XtAppErrorMsg/XtAppErrorMsg
 
 XtAppSetWarningMsgHandler
 	"VSW5TESTSUITE CASE XtAppSetWarningMsgHandler 2"
-	/tset/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler
+	/Xt13/XtAppSetWarningMsgHandler/XtAppSetWarningMsgHandler
 
 XtAppWarningMsg
 	"VSW5TESTSUITE CASE XtAppWarningMsg 3"
-	/tset/Xt13/XtAppWarningMsg/XtAppWarningMsg
+	/Xt13/XtAppWarningMsg/XtAppWarningMsg
 
 XtAppSetErrorHandler
 	"VSW5TESTSUITE CASE XtAppSetErrorHandler 2"
-	/tset/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler
+	/Xt13/XtAppSetErrorHandler/XtAppSetErrorHandler
 
 XtAppError
 	"VSW5TESTSUITE CASE XtAppError 3"
-	/tset/Xt13/XtAppError/XtAppError
+	/Xt13/XtAppError/XtAppError
 
 XtAppSetWarningHandler
 	"VSW5TESTSUITE CASE XtAppSetWarningHandler 2"
-	/tset/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler
+	/Xt13/XtAppSetWarningHandler/XtAppSetWarningHandler
 
 XtAppWarning
 	"VSW5TESTSUITE CASE XtAppWarning 3"
-	/tset/Xt13/XtAppWarning/XtAppWarning
+	/Xt13/XtAppWarning/XtAppWarning
 
 XtSetWMColormapWindows
 	"VSW5TESTSUITE CASE XtSetWMColormapWindows 3"
-	/tset/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows
+	/Xt13/XtSetWMColormapWindows/XtSetWMColormapWindows
 
 XtFindFile
 	"VSW5TESTSUITE CASE XtFindFile 7"
-	/tset/Xt13/XtFindFile/XtFindFile
+	/Xt13/XtFindFile/XtFindFile
 
 XtResolvePathname
 	"VSW5TESTSUITE CASE XtResolvePathname 20"
-	/tset/Xt13/XtResolvePathname/XtResolvePathname
+	/Xt13/XtResolvePathname/XtResolvePathname
 
 #Discrete tests for Xt Chapter 14
 
 ObjectObject
 	"VSW5TESTSUITE CASE ObjectObject 9"
-	/tset/Xt14/ObjectObject/ObjectObject
+	/Xt14/ObjectObject/ObjectObject
 
 RectangleObject
 	"VSW5TESTSUITE CASE RectangleObject 9"
-	/tset/Xt14/RectangleObject/RectangleObject
+	/Xt14/RectangleObject/RectangleObject
 
 #Discrete tests for Xt Chapter 15
 
 XtSpecificationRelease
 	"VSW5TESTSUITE CASE XtSpecificationRelease 2"
-	/tset/Xt15/XtSpecificationRelease/XtSpecificationRelease
+	/Xt15/XtSpecificationRelease/XtSpecificationRelease
 
 #Discrete tests for Xt Appendix C
 
 XtGetErrorDatabase
 	"VSW5TESTSUITE CASE XtGetErrorDatabase 1"
-	/tset/XtC/XtGetErrorDatabase/XtGetErrorDatabase
+	/XtC/XtGetErrorDatabase/XtGetErrorDatabase
 
 XtGetErrorDatabaseText
 	"VSW5TESTSUITE CASE XtGetErrorDatabaseText 2"
-	/tset/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText
+	/XtC/XtGetErrorDatabaseText/XtGetErrorDatabaseText
 
 XtInitialize
 	"VSW5TESTSUITE CASE XtInitialize 27"
-	/tset/XtC/XtInitialize/XtInitialize
+	/XtC/XtInitialize/XtInitialize
 
 XtMainLoop
 	"VSW5TESTSUITE CASE XtMainLoop 28"
-	/tset/XtC/XtMainLoop/XtMainLoop
+	/XtC/XtMainLoop/XtMainLoop
 
 XtNextEvent
 	"VSW5TESTSUITE CASE XtNextEvent 4"
-	/tset/XtC/XtNextEvent/XtNextEvent
+	/XtC/XtNextEvent/XtNextEvent
 
 XtProcessEvent
 	"VSW5TESTSUITE CASE XtProcessEvent 12"
-	/tset/XtC/XtProcessEvent/XtProcessEvent
+	/XtC/XtProcessEvent/XtProcessEvent
 
 XtPeekEvent
 	"VSW5TESTSUITE CASE XtPeekEvent 3"
-	/tset/XtC/XtPeekEvent/XtPeekEvent
+	/XtC/XtPeekEvent/XtPeekEvent
 
 XtPending
 	"VSW5TESTSUITE CASE XtPending 2"
-	/tset/XtC/XtPending/XtPending
+	/XtC/XtPending/XtPending
 
 XtAddInput
 	"VSW5TESTSUITE CASE XtAddInput 5"
-	/tset/XtC/XtAddInput/XtAddInput
+	/XtC/XtAddInput/XtAddInput
 
 XtAddTimeOut
 	"VSW5TESTSUITE CASE XtAddTimeOut 2"
-	/tset/XtC/XtAddTimeOut/XtAddTimeOut
+	/XtC/XtAddTimeOut/XtAddTimeOut
 
 XtAddWorkProc
 	"VSW5TESTSUITE CASE XtAddWorkProc 5"
-	/tset/XtC/XtAddWorkProc/XtAddWorkProc
+	/XtC/XtAddWorkProc/XtAddWorkProc
 
 XtCreateApplicationShell
 	"VSW5TESTSUITE CASE XtCreateApplicationShell 7"
-	/tset/XtC/XtCreateApplicationShell/XtCreateApplicationShell
+	/XtC/XtCreateApplicationShell/XtCreateApplicationShell
 
 XtStringConversionWarning
 	"VSW5TESTSUITE CASE XtStringConversionWarning 1"
-	/tset/XtC/XtStringConversionWarning/XtStringConversionWarning
+	/XtC/XtStringConversionWarning/XtStringConversionWarning
 
 XtAddConverter
 	"VSW5TESTSUITE CASE XtAddConverter 10"
-	/tset/XtC/XtAddConverter/XtAddConverter
+	/XtC/XtAddConverter/XtAddConverter
 
 XtAppAddConverter
 	"VSW5TESTSUITE CASE XtAppAddConverter 10"
-	/tset/XtC/XtAppAddConverter/XtAppAddConverter
+	/XtC/XtAppAddConverter/XtAppAddConverter
 
 XtConvert
 	"VSW5TESTSUITE CASE XtConvert 1"
-	/tset/XtC/XtConvert/XtConvert
+	/XtC/XtConvert/XtConvert
 
 XtDirectConvert
 	"VSW5TESTSUITE CASE XtDirectConvert 3"
-	/tset/XtC/XtDirectConvert/XtDirectConvert
+	/XtC/XtDirectConvert/XtDirectConvert
 
 XtDestroyGC
 	"VSW5TESTSUITE CASE XtDestroyGC 2"
-	/tset/XtC/XtDestroyGC/XtDestroyGC
+	/XtC/XtDestroyGC/XtDestroyGC
 
 XtAddActions
 	"VSW5TESTSUITE CASE XtAddActions 3"
-	/tset/XtC/XtAddActions/XtAddActions
+	/XtC/XtAddActions/XtAddActions
 
 XtSetSelectionTimeout
 	"VSW5TESTSUITE CASE XtSetSelectionTimeout 1"
-	/tset/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout
+	/XtC/XtSetSelectionTimeout/XtSetSelectionTimeout
 
 XtGetSelectionTimeout
 	"VSW5TESTSUITE CASE XtGetSelectionTimeout 2"
-	/tset/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout
+	/XtC/XtGetSelectionTimeout/XtGetSelectionTimeout
 
 XtSetErrorMsgHandler
 	"VSW5TESTSUITE CASE XtSetErrorMsgHandler 1"
-	/tset/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler
+	/XtC/XtSetErrorMsgHandler/XtSetErrorMsgHandler
 
 XtErrorMsg
 	"VSW5TESTSUITE CASE XtErrorMsg 3"
-	/tset/XtC/XtErrorMsg/XtErrorMsg
+	/XtC/XtErrorMsg/XtErrorMsg
 
 XtSetWarningHandler
 	"VSW5TESTSUITE CASE XtSetWarningHandler 1"
-	/tset/XtC/XtSetWarningHandler/XtSetWarningHandler
+	/XtC/XtSetWarningHandler/XtSetWarningHandler
 
 XtSetWarningMsgHandler
 	"VSW5TESTSUITE CASE XtSetWarningMsgHandler 1"
-	/tset/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler
+	/XtC/XtSetWarningMsgHandler/XtSetWarningMsgHandler
 
 XtWarning
 	"VSW5TESTSUITE CASE XtWarning 3"
-	/tset/XtC/XtWarning/XtWarning
+	/XtC/XtWarning/XtWarning
 
 XtWarningMsg
 	"VSW5TESTSUITE CASE XtWarningMsg 3"
-	/tset/XtC/XtWarningMsg/XtWarningMsg
+	/XtC/XtWarningMsg/XtWarningMsg
 
 XtSetErrorHandler
 	"VSW5TESTSUITE CASE XtSetErrorHandler 1"
-	/tset/XtC/XtSetErrorHandler/XtSetErrorHandler
+	/XtC/XtSetErrorHandler/XtSetErrorHandler
 
 XtError
 	"VSW5TESTSUITE CASE XtError 3"
-	/tset/XtC/XtError/XtError
+	/XtC/XtError/XtError
 
 #Discrete tests for Xt Appendix E
 
 StringDefs.h
 	"VSW5TESTSUITE CASE StringDefs.h 1"
-	/tset/XtE/StringDefs.h/StringDefs.h
+	/XtE/StringDefs.h/StringDefs.h
diff --git a/xts5/tset/.gitignore b/xts5/tset/.gitignore
deleted file mode 100644
index 3927da22..00000000
--- a/xts5/tset/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.c
-*.err
-*.log
-*.log.tmp
-.dirstamp
-tet_lock
-tet_xres
diff --git a/xts5/tset/Makefile.am b/xts5/tset/Makefile.am
deleted file mode 100644
index 33d8efac..00000000
--- a/xts5/tset/Makefile.am
+++ /dev/null
@@ -1,850 +0,0 @@
-include ../common.mk
-
-SUBDIRS = Xproto Xopen Xlib3 Xlib4 Xlib5 Xlib6 Xlib7 Xlib8 Xlib9 Xlib10 \
-	Xlib11 Xlib12 Xlib13 Xlib14 Xlib15 Xlib16 Xlib17 XIproto XI
-
-CLEANFILES = */*/tet_lock
-LOGFILES = */*/*.log
-DISTCLEANFILES = $(LOGFILES) */*/*.log.tmp
-
-.PHONY: $(TESTS)
-# Skip Xopen_TESTS for now since they mangle keymap
-TESTS = $(Xproto_TESTS) $(Xlib3_TESTS) $(Xlib4_TESTS) $(Xlib5_TESTS) \
-	$(Xlib6_TESTS) $(Xlib7_TESTS) $(Xlib8_TESTS) $(Xlib9_TESTS) \
-	$(Xlib10_TESTS) $(Xlib11_TESTS) $(Xlib12_TESTS) $(Xlib13_TESTS) \
-	$(Xlib14_TESTS) $(Xlib15_TESTS) $(Xlib16_TESTS) $(Xlib17_TESTS) \
-	$(XIproto_TESTS) $(XI_TESTS)
-
-# Helpful pattern target for testing subsets (test-Xopen, etc.)
-test-%:
-	@$(MAKE) $(AM_MAKEFLAGS) check TESTS='$($*_TESTS)'
-
-Xproto_TESTS = \
-	pAllocColor \
-	pAllocColorCells \
-	pAllocColorPlanes \
-	pAllocNamedColor \
-	pAllowEvents \
-	pBadRequest \
-	pBell \
-	pChangeActivePointerGrab \
-	pChangeGC \
-	pChangeHosts \
-	pChangeKeyboardControl \
-	pChangeKeyboardMapping \
-	pChangePointerControl \
-	pChangeProperty \
-	pChangeSaveSet \
-	pChangeWindowAttributes \
-	pClearArea \
-	pCloseFont \
-	pConfigureWindow \
-	pConvertSelection \
-	pCopyArea \
-	pCopyColormapAndFree \
-	pCopyGC \
-	pCopyPlane \
-	pCirculateWindow \
-	pCreateColormap \
-	pCreateCursor \
-	pCreateGC \
-	pCreateGlyphCursor \
-	pCreatePixmap \
-	pCreateWindow \
-	pDeleteProperty \
-	pDestroySubwindows \
-	pDestroyWindow \
-	pFillPoly \
-	pFreeColormap \
-	pFreeColors \
-	pFreeCursor \
-	pForceScreenSaver \
-	pFreeGC \
-	pFreePixmap \
-	pGrabButton \
-	pGrabKey \
-	pGrabKeyboard \
-	pGrabPointer \
-	pGrabServer \
-	pGetAtomName \
-	pGetFontPath \
-	pGetGeometry \
-	pGetImage \
-	pGetInputFocus \
-	pGetKeyboardControl \
-	pGetKeyboardMapping \
-	pGetModifierMapping \
-	pGetMotionEvents \
-	pGetPointerControl \
-	pGetPointerMapping \
-	pGetProperty \
-	pGetScreenSaver \
-	pGetSelectionOwner \
-	pGetWindowAttributes \
-	pImageText16 \
-	pImageText8 \
-	pInstallColormap \
-	pInternAtom \
-	pKillClient \
-	pLookupColor \
-	pListExtensions \
-	pListFonts \
-	pListFontsWithInfo \
-	pListHosts \
-	pListInstalledColormaps \
-	pListProperties \
-	pMapSubwindows \
-	pMapWindow \
-	pNoOperation \
-	pOpenDisplay \
-	pOpenFont \
-	pPolyArc \
-	pPolyFillArc \
-	pPolyFillRectangle \
-	pPolyLine \
-	pPolyPoint \
-	pPolyRectangle \
-	pPolySegment \
-	pPolyText16 \
-	pPolyText8 \
-	pPutImage \
-	pQueryBestSize \
-	pQueryColors \
-	pQueryExtension \
-	pQueryFont \
-	pQueryKeymap \
-	pQueryPointer \
-	pQueryTree \
-	pQueryTextExtents \
-	pRecolorCursor \
-	pReparentWindow \
-	pRotateProperties \
-	pSendEvent \
-	pSetAccessControl \
-	pSetClipRectangles \
-	pSetCloseDownMode \
-	pSetDashes \
-	pSetFontPath \
-	pSetInputFocus \
-	pSetModifierMapping \
-	pSetPointerMapping \
-	pStoreColors \
-	pStoreNamedColor \
-	pSetScreenSaver \
-	pSetSelectionOwner \
-	pTranslateCoords \
-	pUngrabButton \
-	pUngrabKey \
-	pUngrabKeyboard \
-	pUngrabPointer \
-	pUngrabServer \
-	pUnmapSubwindows \
-	pUnmapWindow \
-	pUninstallColormap \
-	pWarpPointer
-
-Xopen_TESTS = \
-	xXAllocNamedColor \
-	xcursorfont \
-	xXCreateFontCursor \
-	xkeysym \
-	xkeysymdef \
-	xXKeysymToKeycode \
-	xXLookupColor \
-	xXStringToKeysym
-
-Xlib3_TESTS = \
-	XAllPlanes \
-	XBlackPixel \
-	BlackPixel \
-	XBlackPixelOfScreen \
-	BlackPixelOfScreen \
-	XBitmapBitOrder \
-	BitmapBitOrder \
-	XBitmapPad \
-	BitmapPad \
-	XBitmapUnit \
-	BitmapUnit \
-	XCellsOfScreen \
-	CellsOfScreen \
-	XCloseDisplay \
-	XConnectionNumber \
-	ConnectionNumber \
-	XDefaultColormap \
-	DefaultColormap \
-	XDefaultColormapOfScreen \
-	DefaultColormapOfScreen \
-	XDefaultDepth \
-	DefaultDepth \
-	XDefaultDepthOfScreen \
-	DefaultDepthOfScreen \
-	XDefaultGC \
-	DefaultGC \
-	XDefaultGCOfScreen \
-	DefaultGCOfScreen \
-	XDefaultRootWindow \
-	DefaultRootWindow \
-	XDefaultScreen \
-	DefaultScreen \
-	XDefaultScreenOfDisplay \
-	DefaultScreenOfDisplay \
-	XDefaultVisual \
-	DefaultVisual \
-	XDefaultVisualOfScreen \
-	DefaultVisualOfScreen \
-	XDoesBackingStore \
-	DoesBackingStore \
-	XDisplayCells \
-	DisplayCells \
-	XDisplayHeight \
-	DisplayHeight \
-	XDisplayHeightMM \
-	DisplayHeightMM \
-	XDisplayOfScreen \
-	DisplayOfScreen \
-	XDisplayPlanes \
-	DisplayPlanes \
-	XDisplayString \
-	DisplayString \
-	XDisplayWidth \
-	DisplayWidth \
-	XDisplayWidthMM \
-	DisplayWidthMM \
-	XDoesSaveUnders \
-	DoesSaveUnders \
-	XEventMaskOfScreen \
-	EventMaskOfScreen \
-	XFree \
-	XHeightMMOfScreen \
-	HeightMMOfScreen \
-	XHeightOfScreen \
-	HeightOfScreen \
-	XImageByteOrder \
-	ImageByteOrder \
-	XListDepths \
-	XLastKnownRequestProcessed \
-	LastKnownRequestProcessed \
-	XListPixmapFormats \
-	XMinCmapsOfScreen \
-	MinCmapsOfScreen \
-	XMaxCmapsOfScreen \
-	MaxCmapsOfScreen \
-	XNoOp \
-	XNextRequest \
-	NextRequest \
-	XOpenDisplay \
-	XPlanesOfScreen \
-	PlanesOfScreen \
-	XProtocolRevision \
-	ProtocolRevision \
-	XProtocolVersion \
-	ProtocolVersion \
-	XQLength \
-	QLength \
-	XRootWindow \
-	RootWindow \
-	XRootWindowOfScreen \
-	RootWindowOfScreen \
-	XScreenCount \
-	ScreenCount \
-	XScreenNumberOfScreen \
-	XScreenOfDisplay \
-	ScreenOfDisplay \
-	XServerVendor \
-	ServerVendor \
-	XSetCloseDownMode \
-	XVendorRelease \
-	VendorRelease \
-	XWidthMMOfScreen \
-	WidthMMOfScreen \
-	XWidthOfScreen \
-	WidthOfScreen \
-	XWhitePixel \
-	WhitePixel \
-	XWhitePixelOfScreen \
-	WhitePixelOfScreen
-
-Xlib4_TESTS = \
-	XChangeWindowAttributes \
-	XConfigureWindow \
-	XCirculateSubwindows \
-	XCirculateSubwindowsDown \
-	XCirculateSubwindowsUp \
-	XCreateSimpleWindow \
-	XCreateWindow \
-	XDefineCursor \
-	XDestroySubwindows \
-	XDestroyWindow \
-	XLowerWindow \
-	XMapRaised \
-	XMapSubwindows \
-	XMapWindow \
-	XMoveResizeWindow \
-	XMoveWindow \
-	XRestackWindows \
-	XRaiseWindow \
-	XResizeWindow \
-	XSetWindowBackground \
-	XSetWindowBackgroundPixmap \
-	XSetWindowBorder \
-	XSetWindowBorderPixmap \
-	XSetWindowBorderWidth \
-	XSetWindowColormap \
-	XUndefineCursor \
-	XUnmapSubwindows \
-	XUnmapWindow \
-	XVisualIDFromVisual
-
-Xlib5_TESTS = \
-	XChangeProperty \
-	XConvertSelection \
-	XDeleteProperty \
-	XGetAtomName \
-	XGetGeometry \
-	XGetSelectionOwner \
-	XGetWindowAttributes \
-	XGetWindowProperty \
-	XInternAtom \
-	XListProperties \
-	XQueryPointer \
-	XQueryTree \
-	XRotateWindowProperties \
-	XSetSelectionOwner \
-	XTranslateCoordinates
-
-Xlib6_TESTS = \
-	XCreatePixmap \
-	XCreateFontCursor \
-	XCreateGlyphCursor \
-	XCreatePixmapCursor \
-	XFreeCursor \
-	XFreePixmap \
-	XQueryBestCursor \
-	XRecolorCursor
-
-Xlib7_TESTS = \
-	XAllocColor \
-	XAllocColorCells \
-	XAllocColorPlanes \
-	XAllocNamedColor \
-	XCopyColormapAndFree \
-	XCreateColormap \
-	XFreeColormap \
-	XFreeColors \
-	XLookupColor \
-	XParseColor \
-	XQueryColor \
-	XQueryColors \
-	XStoreColor \
-	XStoreColors \
-	XStoreNamedColor \
-	XcmsAllocColor \
-	XcmsAddColorSpace \
-	XcmsAddFunctionSet \
-	XcmsAllocNamedColor \
-	XcmsCCCOfColormap \
-	XcmsConvertColors \
-	XcmsCIELabQueryMaxLC \
-	XcmsCIELabQueryMaxC \
-	XcmsCIELabQueryMaxL \
-	XcmsConversionProc \
-	XcmsConversionProc \
-	XcmsCreateCCC \
-	XcmsDefaultCCC \
-	XcmsDisplayOfCCC \
-	XcmsFreeCCC \
-	XcmsFormatOfPrefix \
-	XcmsLookupColor \
-	XcmsCIELabQueryMinL \
-	XcmsPrefixOfFormat \
-	XcmsQueryBlack \
-	XcmsQueryBlue \
-	XcmsQueryColor \
-	XcmsQueryColors \
-	XcmsQueryGreen \
-	XcmsCIELuvQueryMaxC \
-	XcmsCIELuvQueryMinL \
-	XcmsCIELuvQueryMaxL \
-	XcmsCIELuvQueryMaxLC \
-	XcmsQueryRed \
-	XcmsQueryWhite \
-	XcmsScreenNumberOfCCC \
-	XcmsStoreColor \
-	XcmsStoreColors \
-	XcmsTekHVCQueryMaxC \
-	XcmsTekHVCQueryMinV \
-	XcmsTekHVCQueryMaxV \
-	XcmsTekHVCQueryMaxVC \
-	XcmsTekHVCQueryMaxVSamples \
-	XcmsVisualOfCCC \
-	XcmsSetWhiteAdjustProc \
-	XcmsScreenWhitePointOfCCC \
-	XcmsClientWhitePointOfCCC \
-	XcmsSetWhitePoint
-
-Xlib8_TESTS = \
-	XChangeGC \
-	XCopyGC \
-	XCreateGC \
-	XFreeGC \
-	XGContextFromGC \
-	XGetGCValues \
-	XQueryBestStipple \
-	XQueryBestSize \
-	XQueryBestTile \
-	XSetArcMode \
-	XSetBackground \
-	XSetClipMask \
-	XSetClipOrigin \
-	XSetClipRectangles \
-	XSetDashes \
-	XSetFillRule \
-	XSetFillStyle \
-	XSetFunction \
-	XSetFont \
-	XSetForeground \
-	XSetGraphicsExposures \
-	XSetLineAttributes \
-	XSetPlaneMask \
-	XSetSubwindowMode \
-	XSetStipple \
-	XSetState \
-	XSetTile \
-	XSetTSOrigin \
-	XFlushGC
-
-Xlib9_TESTS = \
-	XClearArea \
-	XClearWindow \
-	XCopyArea \
-	XCopyPlane \
-	XDrawArc \
-	XDrawArcs \
-	XDrawImageString16 \
-	XDrawImageString \
-	XDrawLine \
-	XDrawLines \
-	XDrawPoint \
-	XDrawPoints \
-	XDrawRectangle \
-	XDrawRectangles \
-	XDrawSegments \
-	XDrawString \
-	XDrawString16 \
-	XDrawText \
-	XDrawText16 \
-	XFillArc \
-	XFillArcs \
-	XFillPolygon \
-	XFillRectangle \
-	XFillRectangles \
-	XFreeFont \
-	XFreeFontInfo \
-	XFreeFontNames \
-	XFreeFontPath \
-	XGetFontProperty \
-	XGetFontPath \
-	XGetImage \
-	XGetSubImage \
-	XLoadFont \
-	XLoadQueryFont \
-	XListFonts \
-	XListFontsWithInfo \
-	XPutImage \
-	XQueryFont \
-	XQueryTextExtents16 \
-	XQueryTextExtents \
-	XSetFontPath \
-	XTextExtents16 \
-	XTextExtents \
-	XTextWidth \
-	XTextWidth16 \
-	XUnloadFont
-
-Xlib10_TESTS = \
-	XActivateScreenSaver \
-	XAddHost \
-	XAddHosts \
-	XAddToSaveSet \
-	XChangeSaveSet \
-	XDisableAccessControl \
-	XEnableAccessControl \
-	XForceScreenSaver \
-	XGrabServer \
-	XGetScreenSaver \
-	XInstallColormap \
-	XKillClient \
-	XListHosts \
-	XListInstalledColormaps \
-	XRemoveFromSaveSet \
-	XRemoveHost \
-	XRemoveHosts \
-	XReparentWindow \
-	XResetScreenSaver \
-	XSetAccessControl \
-	XSetScreenSaver \
-	XUngrabServer \
-	XUninstallColormap
-
-Xlib11_TESTS = \
-	ButtonPress \
-	ButtonRelease \
-	ClientMessage \
-	ColormapNotify \
-	ConfigureNotify \
-	ConfigureRequest \
-	CirculateNotify \
-	CirculateRequest \
-	CreateNotify \
-	DestroyNotify \
-	EnterNotify \
-	Expose \
-	FocusIn \
-	FocusOut \
-	GraphicsExpose \
-	GravityNotify \
-	KeymapNotify \
-	KeyPress \
-	KeyRelease \
-	LeaveNotify \
-	MapNotify \
-	MappingNotify \
-	MapRequest \
-	MotionNotify \
-	NoExpose \
-	PropertyNotify \
-	ReparentNotify \
-	ResizeRequest \
-	SelectionClear \
-	SelectionNotify \
-	SelectionRequest \
-	UnmapNotify \
-	VisibilityNotify
-
-Xlib12_TESTS = \
-	XCheckIfEvent \
-	XCheckMaskEvent \
-	XCheckTypedEvent \
-	XCheckTypedWindowEvent \
-	XCheckWindowEvent \
-	XDisplayMotionBufferSize \
-	XDisplayName \
-	XEventsQueued \
-	XFlush \
-	XGetErrorDatabaseText \
-	XGetErrorText \
-	XGetMotionEvents \
-	XIfEvent \
-	XMaskEvent \
-	XNextEvent \
-	XPeekEvent \
-	XPeekIfEvent \
-	XPending \
-	XPutBackEvent \
-	XSelectInput \
-	XSendEvent \
-	XSetAfterFunction \
-	XSetErrorHandler \
-	XSetIOErrorHandler \
-	XSync \
-	XSynchronize \
-	XWindowEvent
-
-Xlib13_TESTS = \
-	XAllowEvents \
-	XAutoRepeatOff \
-	XAutoRepeatOn \
-	XBell \
-	XChangeActivePointerGrab \
-	XChangeKeyboardControl \
-	XChangeKeyboardMapping \
-	XChangePointerControl \
-	XDeleteModifiermapEntry \
-	XDisplayKeycodes \
-	XFreeModifiermap \
-	XGrabButton \
-	XGrabKey \
-	XGrabKeyboard \
-	XGrabPointer \
-	XGetInputFocus \
-	XGetKeyboardControl \
-	XGetKeyboardMapping \
-	XGetModifierMapping \
-	XGetPointerControl \
-	XGetPointerMapping \
-	XInsertModifiermapEntry \
-	XNewModifiermap \
-	XQueryKeymap \
-	XSetInputFocus \
-	XSetModifierMapping \
-	XSetPointerMapping \
-	XUngrabButton \
-	XUngrabKey \
-	XUngrabKeyboard \
-	XUngrabPointer \
-	XWarpPointer
-
-Xlib14_TESTS = \
-	XBaseFontNameListOfFontSet \
-	XCloseIM \
-	XContextDependentDrawing \
-	XCreateFontSet \
-	XCreateIC \
-	XDestroyIC \
-	XDisplayOfIM \
-	XExtentsOfFontSet \
-	XFilterEvent \
-	XFontsOfFontSet \
-	XFreeFontSet \
-	XGetICValues \
-	XGetIMValues \
-	XIMOfIC \
-	XLocaleOfFontSet \
-	XLocaleOfIM \
-	XmbDrawImageString \
-	XmbDrawString \
-	XmbDrawText \
-	XmbLookupString \
-	XmbResetIC \
-	XmbSetWMProperties \
-	XmbTextEscapement \
-	XmbTextExtents \
-	XmbTextListToTextProperty \
-	XmbTextPerCharExtents \
-	XmbTextPropertyToTextList \
-	XOpenIM \
-	XSetICFocus \
-	XSetICValues \
-	XSupportsLocale \
-	XSetLocaleModifiers \
-	XUnsetICFocus \
-	XVaCreateNestedList \
-	XwcDrawImageString \
-	XwcDrawString \
-	XwcDrawText \
-	XwcFreeStringList \
-	XwcLookupString \
-	XwcResetIC \
-	XwcTextEscapement \
-	XwcTextListToTextProperty \
-	XwcTextPerCharExtents \
-	XwcTextPropertyToTextList \
-	XwcTextExtents
-
-Xlib15_TESTS = \
-	XAllocClassHint \
-	XAllocIconSize \
-	XAllocStandardColormap \
-	XAllocSizeHints \
-	XAllocWMHints \
-	XFreeStringList \
-	XFetchName \
-	XGetClassHint \
-	XGetCommand \
-	XGetIconName \
-	XGetIconSizes \
-	XGetRGBColormaps \
-	XGetTransientForHint \
-	XGetTextProperty \
-	XGetWMClientMachine \
-	XGetWMColormapWindows \
-	XGetWMHints \
-	XGetWMIconName \
-	XGetWMName \
-	XGetWMNormalHints \
-	XGetWMProtocols \
-	XGetWMSizeHints \
-	XIconifyWindow \
-	XReconfigureWMWindow \
-	XSetClassHint \
-	XSetCommand \
-	XSetIconName \
-	XSetIconSizes \
-	XSetRGBColormaps \
-	XStringListToTextProperty \
-	XStoreName \
-	XSetTransientForHint \
-	XSetTextProperty \
-	XSetWMClientMachine \
-	XSetWMColormapWindows \
-	XSetWMHints \
-	XSetWMIconName \
-	XSetWMName \
-	XSetWMNormalHints \
-	XSetWMProperties \
-	XSetWMProtocols \
-	XSetWMSizeHints \
-	XTextPropertyToStringList \
-	XWithdrawWindow \
-	XDefaultString
-
-Xlib16_TESTS = \
-	XrmDestroyDatabase \
-	XrmGetFileDatabase \
-	XrmGetResource \
-	XrmGetStringDatabase \
-	XrmInitialize \
-	XrmMergeDatabases \
-	XrmParseCommand \
-	XrmPutFileDatabase \
-	XrmPutLineResource \
-	XrmPutResource \
-	XrmPutStringResource \
-	XrmQGetResource \
-	XrmQGetSearchList \
-	XrmQGetSearchResource \
-	XrmQPutResource \
-	XrmQPutStringResource \
-	XrmQuarkToString \
-	XrmStringToBindingQuarkList \
-	XrmStringToQuark \
-	XrmStringToQuarkList \
-	XrmUniqueQuark \
-	XResourceManagerString \
-	XrmCombineDatabase \
-	XrmCombineFileDatabase \
-	XrmEnumerateDatabase \
-	XrmGetDatabase \
-	XrmLocaleOfDatabase \
-	XrmPermStringToQuark \
-	XrmSetDatabase \
-	XScreenResourceString
-
-Xlib17_TESTS = \
-	XAddPixel \
-	XClipBox \
-	XCreateBitmapFromData \
-	XCreateImage \
-	XCreatePixmapFromBitmapData \
-	XCreateRegion \
-	XDeleteContext \
-	XDestroyImage \
-	XDestroyRegion \
-	XEmptyRegion \
-	XEqualRegion \
-	XFindContext \
-	XFetchBuffer \
-	XFetchBytes \
-	XGetDefault \
-	XGetPixel \
-	XGetVisualInfo \
-	XIntersectRegion \
-	IsCursorKey \
-	IsFunctionKey \
-	IsKeypadKey \
-	IsModifierKey \
-	IsMiscFunctionKey \
-	IsPFKey \
-	XKeycodeToKeysym \
-	XKeysymToKeycode \
-	XKeysymToString \
-	XLookupKeysym \
-	XLookupString \
-	XMatchVisualInfo \
-	XOffsetRegion \
-	XPolygonRegion \
-	XPointInRegion \
-	Xpermalloc \
-	XParseGeometry \
-	XPutPixel \
-	XRebindKeysym \
-	XRectInRegion \
-	XReadBitmapFile \
-	XRefreshKeyboardMapping \
-	XRotateBuffers \
-	XSubImage \
-	XSubtractRegion \
-	XShrinkRegion \
-	XStoreBuffer \
-	XStoreBytes \
-	XSetRegion \
-	XStringToKeysym \
-	XSaveContext \
-	XUnionRectWithRegion \
-	XUnionRegion \
-	XUniqueContext \
-	XWMGeometry \
-	XWriteBitmapFile \
-	XXorRegion
-
-XIproto_TESTS = \
-	AllowDeviceEvents \
-	ChangeDeviceControl \
-	ChangeDeviceDontPropagateList \
-	ChangeFeedbackControl \
-	ChangeKeyboardDevice \
-	ChangePointerDevice \
-	ChangeDeviceKeyMapping \
-	CloseDevice \
-	DeviceBell \
-	GetDeviceModifierMapping \
-	GetFeedbackControl \
-	GetExtensionVersion \
-	GrabDevice \
-	GrabDeviceButton \
-	GrabDeviceKey \
-	GetDeviceButtonMapping \
-	GetDeviceControl \
-	GetDeviceFocus \
-	GetDeviceMotionEvents \
-	GetDeviceDontPropagateList \
-	GetDeviceKeyMapping \
-	GetSelectedExtensionEvents \
-	ListInputDevices \
-	OpenDevice \
-	QueryDeviceState \
-	SetDeviceValuators \
-	SetDeviceButtonMapping \
-	SetDeviceFocus \
-	SetDeviceModifierMapping \
-	SetDeviceMode \
-	SelectExtensionEvent \
-	SendExtensionEvent \
-	UngrabDevice \
-	UngrabDeviceButton \
-	UngrabDeviceKey
-
-XI_TESTS = \
-	XAllowDeviceEvents \
-	XChangeDeviceControl \
-	XChangeFeedbackControl \
-	XChangeKeyboardDevice \
-	XChangeDeviceDontPropagateList \
-	XChangePointerDevice \
-	XChangeDeviceKeyMapping \
-	XCloseDevice \
-	XDeviceBell \
-	XGetDeviceControl \
-	XGetFeedbackControl \
-	XGetDeviceFocus \
-	XGetDeviceDontPropagateList \
-	XGetExtensionVersion \
-	XGrabDevice \
-	XGrabDeviceButton \
-	XGrabDeviceKey \
-	XGetDeviceButtonMapping \
-	XGetDeviceKeyMapping \
-	XGetDeviceModifierMapping \
-	XGetDeviceMotionEvents \
-	XGetSelectedExtensionEvents \
-	XListInputDevices \
-	Miscellaneous \
-	XOpenDevice \
-	XQueryDeviceState \
-	XSetDeviceValuators \
-	XSetDeviceButtonMapping \
-	XSetDeviceFocus \
-	XSetDeviceModifierMapping \
-	XSetDeviceMode \
-	XSelectExtensionEvent \
-	XSendExtensionEvent \
-	XUngrabDevice \
-	XUngrabDeviceButton \
-	XUngrabDeviceKey
-
-# Store results in xts5/results/YYYY-mm-dd-HH:mm.xzy
-logfile:
-	date=`date +%F-%R`.XXXXX && \
-	XTS_RESULTS_DIR=`mktemp -d --tmpdir=$(top_srcdir)/xts5/results $$date` && \
-	cat $(LOGFILES) > $$XTS_RESULTS_DIR/xts.log
-