diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 364cdff1c1..5119dbb8a8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,35 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-07-19 11:00 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * tests/ac_test.prg
+  * tests/ac_test2.prg
+  * tests/begin.prg
+  * tests/box.prg
+  * tests/byref.prg
+  * tests/codebl.prg
+  * tests/codebloc.prg
+  * tests/db_brows.prg
+  * tests/ddate.prg
+  * tests/ifinline.prg
+  * tests/memvar.prg
+  * tests/menutest.prg
+  * tests/readhrb.prg
+  * tests/speed.prg
+  * tests/speedtst.prg
+  * tests/stripem.prg
+  * tests/switch.prg
+  * tests/testbrw.prg
+  * tests/testcdx.prg
+  * tests/testdecl.prg
+  * tests/testhrb.prg
+  * tests/testpre.prg
+  * tests/testwarn.prg
+  * tests/tstalias.prg
+  * tests/tstmacro.prg
+  * tests/varparam.prg
+    * more cleanups. (assignment operator and string quote usage)
+
 2012-07-19 10:23 UTC+0200 Viktor Szakats (harbour syenar.net)
   * tests/arrayidx.prg
   * tests/brwpos.prg
diff --git a/harbour/tests/ac_test.prg b/harbour/tests/ac_test.prg
index 82807c2636..f77d944f41 100644
--- a/harbour/tests/ac_test.prg
+++ b/harbour/tests/ac_test.prg
@@ -157,14 +157,14 @@ PROCEDURE Main()
 
    CLEAR SCREEN
 
-   SetColor( 'GB+/B,GR+/R,,,W/N' )
+   SetColor( "GB+/B,GR+/R,,,W/N" )
 
    SET CURSOR ON
 
    ASize( aPermits, Len( aPrompts ) )
 
    FOR x := 1 TO Len( aPrompts )
-      aPermits[ x ] := !( 'V' $ aPrompts[ x ] )
+      aPermits[ x ] := !( "V" $ aPrompts[ x ] )
    NEXT
 
 #define TEST1
diff --git a/harbour/tests/ac_test2.prg b/harbour/tests/ac_test2.prg
index 43caad5ea0..6979968be7 100644
--- a/harbour/tests/ac_test2.prg
+++ b/harbour/tests/ac_test2.prg
@@ -23,13 +23,13 @@
 
 PROCEDURE Main()
 
-   //NIL, empty, numeric, and "not handled" - items
-   //must be inaccesible and invisible
+   // NIL, empty, numeric, and "not handled" - items
+   // must be inaccesible and invisible
    LOCAL aMenu1 := { " --Visky--", "", "not handled" }
    LOCAL aMenu2 := { " --Vodka--", " --Water--", NIL, "not handled" }
    LOCAL aMenu3 := { " --Grapa--", 33, "not handled" }
 
-   //for AC_NOITEM mode test
+   // for AC_NOITEM mode test
    LOCAL aMenu4 := { "", "not handled" }
 
 
@@ -37,8 +37,8 @@ PROCEDURE Main()
    LOCAL nCounter := 1
    LOCAL nKeyPressed
 
-   //set to True for items (de)highlighting
-   //algoritm in clipper
+   // set to True for items (de)highlighting
+   // algoritm in clipper
    PUBLIC lHiLiTest := .F.
 
 
@@ -56,8 +56,8 @@ PROCEDURE Main()
       CASE nCounter == 3
          AChoice( 2, 25, 3, 35, aMenu3, .T. )
       CASE nCounter == 4
-         //User function cUF2() fill screen with exclamation marks
-         //in clipper it doe's not called in AC_NOITEM mode
+         // User function cUF2() fill screen with exclamation marks
+         // in clipper it does not get called in AC_NOITEM mode
          AChoice( 2, 37, 3, 47, aMenu4, .T. , "cUF2" )
 
       ENDCASE
@@ -75,8 +75,8 @@ PROCEDURE Main()
 
    RETURN
 
-//Test for current and previous items
-//highliting-dehighliting algoritm
+// Test for current and previous items
+// highliting-dehighliting algoritm
 
 FUNCTION cUF( nMode, nCurElement, nRowPos )
 
@@ -101,8 +101,8 @@ FUNCTION cUF( nMode, nCurElement, nRowPos )
 
    RETURN nRetVal
 
-//test for AC_NOITEM mode
-//Clipper in AC_NOITEM mode do not call User Function
+// test for AC_NOITEM mode
+// Clipper in AC_NOITEM mode do not call User Function
 
 FUNCTION cUF2( nMode, nCurElement, nRowPos )
 
diff --git a/harbour/tests/begin.prg b/harbour/tests/begin.prg
index 1a3e436508..c4761dd7e3 100644
--- a/harbour/tests/begin.prg
+++ b/harbour/tests/begin.prg
@@ -11,7 +11,7 @@ MEMVAR mPrivate
 PROCEDURE Main()
 
    LOCAL oLocal
-   PRIVATE mPrivate := 'private value in MAIN'
+   PRIVATE mPrivate := "private value in MAIN"
 
    BEGIN SEQUENCE
       ? " Inside SEQUENCE 1"
@@ -81,7 +81,7 @@ PROCEDURE Main()
 
 PROCEDURE Break1()
 
-   PRIVATE mPrivate := 'VALUE from Break1'
+   PRIVATE mPrivate := "VALUE from Break1"
 
    BREAK M->mPrivate
 
@@ -93,7 +93,7 @@ PROCEDURE Break2()
       ? " Inside SEQUENCE 8"
       Break3( )
    RECOVER USING oMemvar
-      ? "  Recovering in 8 using...", Eval( oMemvar, ' eval in 8' )
+      ? "  Recovering in 8 using...", Eval( oMemvar, " eval in 8" )
       Break( "BREAK from recovery code" )
    END SEQUENCE
    ? "After SEQUENCE 8"
@@ -118,7 +118,7 @@ PROCEDURE Break3()
       Break4( " and parameter" )
 
    RECOVER USING oMemvar
-      ? "  Recovering in 9 using...", Eval( oMemvar, ' eval in 9' )
+      ? "  Recovering in 9 using...", Eval( oMemvar, " eval in 9" )
       Break( oMemvar )
    END SEQUENCE
    ? "After SEQUENCE 9"
@@ -127,7 +127,7 @@ PROCEDURE Break3()
 
 PROCEDURE Break4( cValue )
 
-   LOCAL oLocal := ' detached Break4 '
+   LOCAL oLocal := " detached Break4 "
 
    Break( {| x | oLocal + x + cValue } )
 
diff --git a/harbour/tests/box.prg b/harbour/tests/box.prg
index e4550ff71f..8ad982d8cd 100644
--- a/harbour/tests/box.prg
+++ b/harbour/tests/box.prg
@@ -8,8 +8,8 @@
 
 PROCEDURE Main()
 
-   DispBox( 1, 1, 5, 5, B_SINGLE + 'X', 'color not supported' )
-   DispBox( 7, 7, 13, 72, B_DOUBLE + '.' )
+   DispBox( 1, 1, 5, 5, B_SINGLE + "X", "color not supported" )
+   DispBox( 7, 7, 13, 72, B_DOUBLE + "." )
    DispBox( 14, 14, 22, 22, B_SINGLE_DOUBLE )
 
    RETURN
diff --git a/harbour/tests/byref.prg b/harbour/tests/byref.prg
index 5b7679f584..639461c823 100644
--- a/harbour/tests/byref.prg
+++ b/harbour/tests/byref.prg
@@ -11,33 +11,33 @@ PROCEDURE Main()
    LOCAL x := 0
 
    QOut( "Managing LOCAL variables by reference" )
-   QOut( 'In main before ref1 x=', x )
+   QOut( "In main before ref1 x=", x )
    ref1( @x )
-   QOut( ' In main after ref1 x=', x )
+   QOut( " In main after ref1 x=", x )
 
 
    QOut( "Managing STATIC variables by reference" )
-   QOut( 'In main before ref1 s=', s )
+   QOut( "In main before ref1 s=", s )
    ref1( @s )
-   QOut( ' In main after ref1 s=', s )
+   QOut( " In main after ref1 s=", s )
 
    RETURN
 
 FUNCTION ref1( x )
 
-   x ++
-   QOut( ' In ref1 before ref2 =', x )
+   x++
+   QOut( " In ref1 before ref2 =", x )
    Ref2( @x )
-   QOut( ' In ref1 after ref2 =', x )
+   QOut( " In ref1 after ref2 =", x )
 
    RETURN nil
 
 FUNCTION ref2( x )
 
-   x ++
-   QOut( '  In ref2 before ref3 =', x )
+   x++
+   QOut( "  In ref2 before ref3 =", x )
    Ref3( @x )
-   QOut( '  In ref2 after ref3 =', x )
+   QOut( "  In ref2 after ref3 =", x )
 
    RETURN nil
 
@@ -45,17 +45,17 @@ FUNCTION ref3( x )
 
    STATIC a
 
-   x ++
-   QOut( '   In ref3 before ref4 =', x )
-   a = { x, x }
+   x++
+   QOut( "   In ref3 before ref4 =", x )
+   a := { x, x }
    Ref4( @a )
-   QOut( '   In ref3 after ref4 =', x )
+   QOut( "   In ref3 after ref4 =", x )
 
    RETURN nil
 
 FUNCTION ref4( a )
 
-   a[ 1 ] ++
-   QOut( '    In ref4 =', a[ 1 ] )
+   a[ 1 ]++
+   QOut( "    In ref4 =", a[ 1 ] )
 
    RETURN nil
diff --git a/harbour/tests/codebl.prg b/harbour/tests/codebl.prg
index 66d4875839..fce1c70ef5 100644
--- a/harbour/tests/codebl.prg
+++ b/harbour/tests/codebl.prg
@@ -62,8 +62,8 @@ PROCEDURE GetArray( a )
    a := Array( 100 )
    FOR i := 1 TO 100
       IF ( i % 6 ) == 0
-         a[ i - 2 ] = NIL
-         a[ i - 4 ] = NIL
+         a[ i - 2 ] := NIL
+         a[ i - 4 ] := NIL
       ENDIF
       a[ i ] := TestBlocks()
    NEXT
diff --git a/harbour/tests/codebloc.prg b/harbour/tests/codebloc.prg
index 629bc6ccb4..e35d19bf3f 100644
--- a/harbour/tests/codebloc.prg
+++ b/harbour/tests/codebloc.prg
@@ -20,10 +20,10 @@ PROCEDURE Main()
    Eval( a, " with parameters", " ... and it works!" )
    OutStd( hb_eol() )
 
-   d = "with access to local variables"
+   d := "with access to local variables"
 
-   a = {| b, c | OutStd( "I am a second codeblock " + d + b + ;
-      iif( c == NIL, ' empty second parameter ', c ) ), OutStd( hb_eol() ), "WITH return value" }
+   a := {| b, c | OutStd( "I am a second codeblock " + d + b + ;
+      iif( c == NIL, " empty second parameter ", c ) ), OutStd( hb_eol() ), "WITH return value" }
    Eval( a, ", codeblock parameters" )
    OutStd( hb_eol() )
 
@@ -39,8 +39,8 @@ PROCEDURE Main()
    AnotherTest( a, "==> Another " )
    OutStd( hb_eol() )
 
-   a = {| c | iif( c == NIL, {| a | "First " + a }, {| a | "Second " + a } ) }
-   a = Eval( a )
+   a := {| c | iif( c == NIL, {| a | "First " + a }, {| a | "Second " + a } ) }
+   a := Eval( a )
    OutStd( hb_eol() )
    OutStd( Eval( a, "codeblock created in a codeblock" ) )
    OutStd( hb_eol() )
@@ -67,14 +67,14 @@ PROCEDURE Main()
    OutStd( hb_eol() )
    x1 := 5
    x2 := 6
-   de = DetachLocal( x1, x2 )
+   de := DetachLocal( x1, x2 )
    OutStd( Eval( de ) )
    //changing the value of variables
    OutStd( hb_eol() )
    x1 := 10
    x2 := 11
    QOut( Eval( de ) )
-   de = DetachLocal( x1, x2 )
+   de := DetachLocal( x1, x2 )
    QOut( Eval( de ) )
 
    RETURN
@@ -116,7 +116,7 @@ PROCEDURE BugToFix()
 
    LOCAL b, a := {|| a + b }
 
-   b = "bug "
+   b := "bug "
    Eval( a )
 
    RETURN
diff --git a/harbour/tests/db_brows.prg b/harbour/tests/db_brows.prg
index d77e51fe29..50429f8bf9 100644
--- a/harbour/tests/db_brows.prg
+++ b/harbour/tests/db_brows.prg
@@ -90,9 +90,9 @@ PROCEDURE Main( filename )
    LOCAL vybkey := 1
 
    IF filename == Nil
-      ? 'Dbf browse demo'
-      ? 'Syntax:'
-      ? '', 'db_brows filename'
+      ? "Dbf browse demo"
+      ? "Syntax:"
+      ? "", "db_brows filename"
       QUIT
    ENDIF
    USE ( filename )
@@ -169,7 +169,7 @@ FUNCTION DBFLIST( mslist, x1, y1, x2, y2, title, maskey )
                ELSEIF LI_MSTYP[ i ] == "N"
                   vartmp        := Str( vartmp )
                   LI_MSLEN[ i ] := Len( vartmp )
-                  LI_MSDEC[ i ] := iif( '.' $ vartmp, LI_MSLEN[ i ] - At( '.', vartmp ), 0 )
+                  LI_MSDEC[ i ] := iif( "." $ vartmp, LI_MSLEN[ i ] - At( ".", vartmp ), 0 )
                ELSEIF LI_MSTYP[ i ] == "D"
                   LI_MSLEN[ i ] := 8
                ELSEIF LI_MSTYP[ i ] == "L"
diff --git a/harbour/tests/ddate.prg b/harbour/tests/ddate.prg
index 364073eb80..a301a51f01 100644
--- a/harbour/tests/ddate.prg
+++ b/harbour/tests/ddate.prg
@@ -28,7 +28,7 @@ PROCEDURE Main()
    dDate := 0d20000229
    ? "Should be '2000.02.29' :", dDate
 
-   a := '0d20040229+1'
+   a := "0d20040229+1"
    ? "Should be '2004.03.01' :", &a
 
    a := "DATE() - 0d20051112"
diff --git a/harbour/tests/ifinline.prg b/harbour/tests/ifinline.prg
index 6dd846e48b..758abff656 100644
--- a/harbour/tests/ifinline.prg
+++ b/harbour/tests/ifinline.prg
@@ -15,7 +15,7 @@ PROCEDURE Main()
 
    QOut( "Now changing n to 2" )
 
-   n = 2
+   n := 2
 
    if( n == 1, QOut( 1 ), QOut( 2 ) )
 
diff --git a/harbour/tests/memvar.prg b/harbour/tests/memvar.prg
index 69bbb16d57..2929f0fa6f 100644
--- a/harbour/tests/memvar.prg
+++ b/harbour/tests/memvar.prg
@@ -45,7 +45,7 @@ PROCEDURE Main()
    __Accept( "press Enter..." )
    Test6()
    __Accept( "press Enter..." )
-   Test7( 'value1', 2, .T. )
+   Test7( "value1", 2, .T. )
    __Accept( "press Enter..." )
    Test8()
    __Accept( "press Enter..." )
@@ -62,17 +62,17 @@ PROCEDURE Test1()
 
    QOut( "==Test 1==PUBLIC -> PRIVATE -> PUBLIC" )
    QOut( memvar1 )
-   memvar1 = 'main'
-   QOut( 'in MAIN=', memvar1 )
+   memvar1 := "main"
+   QOut( "in MAIN=", memvar1 )
    Scope( memvar1 )
-   QOut( 'back in MAIN=', memvar1 )
+   QOut( "back in MAIN=", memvar1 )
    QOut( "" )
 
    RETURN
 
 FUNCTION Scope( value )
 
-   PRIVA memvar1 := 'scope'
+   PRIVA memvar1 := "scope"
 
    Scope2()
    QOut( "in SCOPE=", memvar1 )
@@ -96,17 +96,17 @@ PROCEDURE Test2()
 
    QOut( "==Test 2==PUBLIC -> PUBLIC -> PUBLIC" )
    QOut( memvar2 )
-   memvar2 = 'main'
-   QOut( 'in MAIN=', memvar2 )
+   memvar2 := "main"
+   QOut( "in MAIN=", memvar2 )
    Scope3( memvar2 )
-   QOut( 'back in MAIN=', memvar2 )
+   QOut( "back in MAIN=", memvar2 )
    QOut( "" )
 
    RETURN
 
 FUNCTION Scope3( value )
 
-   PUBLIC memvar2 := 'scope'
+   PUBLIC memvar2 := "scope"
 
    Scope4()
    QOut( "in SCOPE=", memvar2 )
@@ -130,17 +130,17 @@ PROCEDURE Test3()
 
    QOut( "==Test 3==PUBLIC -> PRIVATE -> PUBLIC:=" )
    QOut( memvar3 )
-   memvar3 = 'main'
-   QOut( 'in MAIN=', memvar3 )
+   memvar3 := "main"
+   QOut( "in MAIN=", memvar3 )
    Scope5( memvar3 )
-   QOut( 'back in MAIN=', memvar3 )
+   QOut( "back in MAIN=", memvar3 )
    QOut( "" )
 
    RETURN
 
 FUNCTION Scope5( value )
 
-   PRIVATE memvar3 := 'scope'
+   PRIVATE memvar3 := "scope"
 
    Scope6()
    QOut( "in SCOPE=", memvar3 )
@@ -149,7 +149,7 @@ FUNCTION Scope5( value )
 
 PROCEDURE Scope6()
 
-   PUBLIC memvar3 := 'scope2'
+   PUBLIC memvar3 := "scope2"
 
    QOut( "in SCOPE2=", memvar3 )
 
@@ -164,17 +164,17 @@ PROCEDURE Test4()
 
    QOut( "==Test 4==PUBLIC -> PUBLIC -> PUBLIC:=" )
    QOut( memvar4 )
-   memvar4 = 'main'
-   QOut( 'in MAIN=', memvar4 )
+   memvar4 := "main"
+   QOut( "in MAIN=", memvar4 )
    Scope7( memvar4 )
-   QOut( 'back in MAIN=', memvar4 )
+   QOut( "back in MAIN=", memvar4 )
    QOut( "" )
 
    RETURN
 
 FUNCTION Scope7( value )
 
-   PUBLIC memvar4 := 'scope'
+   PUBLIC memvar4 := "scope"
 
    Scope8()
    QOut( "in SCOPE=", memvar4 )
@@ -183,7 +183,7 @@ FUNCTION Scope7( value )
 
 PROCEDURE Scope8()
 
-   PUBLIC memvar4 := 'scope2'
+   PUBLIC memvar4 := "scope2"
 
    QOut( "in SCOPE2=", memvar4 )
 
@@ -207,11 +207,11 @@ PROCEDURE TEST5()
    QOut( "uninitialized PARAMETER= ", memparam )
    // QOut( memnone )
 
-   mempublic = 'PUBLIC'
+   mempublic := "PUBLIC"
    QOut( "   PUBLIC with new value= ", mempublic )
-   memprivate = 'PRIVATE'
+   memprivate := "PRIVATE"
    QOut( "  PRIVATE with new value= ", memprivate )
-   memparam = 'PARAMETER'
+   memparam := "PARAMETER"
    QOut( "PARAMETER with new value= ", memparam )
    //  memnone =4
    //  Qout( memnone )
@@ -241,7 +241,7 @@ FUNCTION UseVar( value )
    QOut( "undeclared PRIVATE created by __PRIVATE function=", private2 )
    QOut( "undeclared PRIVATE created by __PRIVATE function=", private3 )
 
-   public1 := 'public created by __PUBLIC'
+   public1 := "public created by __PUBLIC"
 #endif
    QOut( "" )
 
@@ -249,7 +249,7 @@ FUNCTION UseVar( value )
 
 PROCEDURE UseRef( reference )
 
-   reference += ' variable'
+   reference += " variable"
 
    RETURN
 
@@ -258,19 +258,19 @@ PROCEDURE UseRef( reference )
 PROCEDURE Test6()
 
    PUBLIC publCB
-   PRIVATE privVar := ' (PRIVATE in MAIN) '
+   PRIVATE privVar := " (PRIVATE in MAIN) "
 
    QOut( "== Test for detached PRIVATE variables" )
-   DetachMemvar( 'detached memvar' )
-   QOut( Eval( publCB, 'in Main: ' ) )
+   DetachMemvar( "detached memvar" )
+   QOut( Eval( publCB, "in Main: " ) )
 
    RETURN
 
 PROCEDURE DetachMemvar( cValue )
 
-   PRIVATE privVar := ' (PRIVATE in DetachMemvar) '
+   PRIVATE privVar := " (PRIVATE in DetachMemvar) "
 
-   publCB = {| x | x + privVar + cValue }
+   publCB := {| x | x + privVar + cValue }
    QOut( Eval( publCB, "in DetachMemvar: " ) )
 
    RETURN
@@ -293,20 +293,20 @@ PROCEDURE Test7( )
 
 PROCEDURE Test8()
 
-   PRIVATE private1 := 'PRIVATE1'
+   PRIVATE private1 := "PRIVATE1"
 
-   QOut( 'In Test8 before UsePriv' )
+   QOut( "In Test8 before UsePriv" )
    QOut( "Private1 = ", private1 )
    UsePriv( private1 )
-   QOut( 'In Test8 after UsePriv' )
+   QOut( "In Test8 after UsePriv" )
    QOut( "Private1 = ", private1 )
 
    __Accept( "press Enter..." )
 
-   QOut( 'In Test8 before UsePriv with reference' )
+   QOut( "In Test8 before UsePriv with reference" )
    QOut( "Private1 = ", private1 )
    UsePriv( @private1 )
-   QOut( 'In Test8 after UsePriv with reference' )
+   QOut( "In Test8 after UsePriv with reference" )
    QOut( "Private1 = ", private1 )
 
    RETURN
@@ -315,11 +315,11 @@ PROCEDURE UsePriv()
 
    PARAMETERS param1
 
-   QOut( 'In UsePriv before UseParam' )
+   QOut( "In UsePriv before UseParam" )
    QOut( "Private1 = ", private1 )
    QOut( "Param1   = ", param1 )
    UseParam()
-   QOut( 'In UsePriv after UseParam' )
+   QOut( "In UsePriv after UseParam" )
    QOut( "Private1 = ", private1 )
    QOut( "Param1   = ", param1 )
 
@@ -329,13 +329,13 @@ PROCEDURE UseParam()
 
    PARAMETER param2
 
-   QOut( 'In UseParam before assignment' )
+   QOut( "In UseParam before assignment" )
    QOut( "Private1 = ", private1 )
    QOut( "Param1   = ", param1 )
    QOut( "Param2   = ", param2 )
-   param2 := 'PARAM2'
+   param2 := "PARAM2"
    param1 := "new value"
-   QOut( 'In UseParam after assignment' )
+   QOut( "In UseParam after assignment" )
    QOut( "Private1 = ", private1 )
    QOut( "Param1   = ", param1 )
    QOut( "Param2   = ", param2 )
@@ -370,8 +370,8 @@ STATIC FUNCTION memfunc( memfunc )
    PARA initmem
    QOut( "Tests for PARAMETERS, PRIVATE nad PUBLIC variables" )
    QOut( "" )
-   QOut( 'in INIT function - Passed parameter = ', memvar )
-   QOut( 'in INIT function - Passed parameter with different name = ', initmem )
+   QOut( "in INIT function - Passed parameter = ", memvar )
+   QOut( "in INIT function - Passed parameter with different name = ", initmem )
    QOut( "" )
 
    RETURN
diff --git a/harbour/tests/menutest.prg b/harbour/tests/menutest.prg
index 5480c8c11f..aff6d45329 100644
--- a/harbour/tests/menutest.prg
+++ b/harbour/tests/menutest.prg
@@ -14,17 +14,17 @@ PROCEDURE Main()
 
    CLEAR SCREEN
 
-   @  1, 10 PROMPT 'Menu Item 1' MESSAGE 'Menu Message 1'
-   @  2, 10 PROMPT 'Menu Item 2' MESSAGE 'Menu Message 2'
-   @  3, 10 PROMPT 'Menu Item 3' MESSAGE 'Menu Message 3'
-   @  4, 10 PROMPT 'Menu Item 4' MESSAGE 'Menu Message 4'
+   @  1, 10 PROMPT "Menu Item 1" MESSAGE "Menu Message 1"
+   @  2, 10 PROMPT "Menu Item 2" MESSAGE "Menu Message 2"
+   @  3, 10 PROMPT "Menu Item 3" MESSAGE "Menu Message 3"
+   @  4, 10 PROMPT "Menu Item 4" MESSAGE "Menu Message 4"
 
-   @  6, 10 SAY 'Testing with LOCAL parameter'
-   @  7, 10 SAY 'Press F8 to recurse into MENU TO'
+   @  6, 10 SAY "Testing with LOCAL parameter"
+   @  7, 10 SAY "Press F8 to recurse into MENU TO"
 
    MENU TO testvar
 
-   @  9, 10 SAY 'Your Choice = ' + Str( testvar, 1 )
+   @  9, 10 SAY "Your Choice = " + Str( testvar, 1 )
 
    Inkey( 0 )
 
@@ -32,17 +32,17 @@ PROCEDURE Main()
 
    CLEAR SCREEN
 
-   @  1, 10 PROMPT 'Menu Item 1' MESSAGE 'Menu Message 1'
-   @  2, 10 PROMPT 'Menu Item 2' MESSAGE 'Menu Message 2'
-   @  3, 10 PROMPT 'Menu Item 3' MESSAGE 'Menu Message 3'
-   @  4, 10 PROMPT 'Menu Item 4' MESSAGE 'Menu Message 4'
+   @  1, 10 PROMPT "Menu Item 1" MESSAGE "Menu Message 1"
+   @  2, 10 PROMPT "Menu Item 2" MESSAGE "Menu Message 2"
+   @  3, 10 PROMPT "Menu Item 3" MESSAGE "Menu Message 3"
+   @  4, 10 PROMPT "Menu Item 4" MESSAGE "Menu Message 4"
 
-   @  6, 10 SAY 'Testing with MEMVAR parameter'
-   @  7, 10 SAY 'Press F8 to recurse into MENU TO'
+   @  6, 10 SAY "Testing with MEMVAR parameter"
+   @  7, 10 SAY "Press F8 to recurse into MENU TO"
 
    MENU TO ptestvar
 
-   @  9, 10 SAY 'Your Choice = ' + Str( ptestvar, 1 )
+   @  9, 10 SAY "Your Choice = " + Str( ptestvar, 1 )
 
    RETURN
 
@@ -52,18 +52,18 @@ PROCEDURE RECURSE()
 
    SET KEY K_F8 TO
 
-   @  6, 10 SAY '                                '
+   @  6, 10 SAY "                                "
 
-   @  1, 50 PROMPT 'Menu Item 1' MESSAGE 'Menu Message 1'
-   @  2, 50 PROMPT 'Menu Item 2' MESSAGE 'Menu Message 2'
-   @  3, 50 PROMPT 'Menu Item 3' MESSAGE 'Menu Message 3'
-   @  4, 50 PROMPT 'Menu Item 4' MESSAGE 'Menu Message 4'
+   @  1, 50 PROMPT "Menu Item 1" MESSAGE "Menu Message 1"
+   @  2, 50 PROMPT "Menu Item 2" MESSAGE "Menu Message 2"
+   @  3, 50 PROMPT "Menu Item 3" MESSAGE "Menu Message 3"
+   @  4, 50 PROMPT "Menu Item 4" MESSAGE "Menu Message 4"
 
    MENU TO testvar
 
-   @  7, 10 SAY 'Press F8 to recurse into MENU TO'
+   @  7, 10 SAY "Press F8 to recurse into MENU TO"
 
-   @  9, 50 SAY 'Your Choice = ' + Str( testvar, 1 )
+   @  9, 50 SAY "Your Choice = " + Str( testvar, 1 )
 
    SET KEY K_F8 TO RECURSE()
 
diff --git a/harbour/tests/readhrb.prg b/harbour/tests/readhrb.prg
index 3b423fcbe2..960d0c97ac 100644
--- a/harbour/tests/readhrb.prg
+++ b/harbour/tests/readhrb.prg
@@ -108,7 +108,7 @@ PROCEDURE Main( cFrom )
 
          ACCEPT "Do you want do list all pcode values? (y/N) " TO m
 
-         IF m $ 'Yy'
+         IF m $ "Yy"
             ?
             cBlock := FReadStr( hFile, 4 )
             nFuncs := hb_BCode( hb_BSubStr( cBlock, 1, 1 ) )     + ;
diff --git a/harbour/tests/speed.prg b/harbour/tests/speed.prg
index 8bfce6e16b..bc0828933e 100644
--- a/harbour/tests/speed.prg
+++ b/harbour/tests/speed.prg
@@ -6,21 +6,21 @@ PROCEDURE Main()
 
    LOCAL Program := { , }, Condition := 1, body := 2, Counter := 1, TheEnd := 1000000, stop, start
 
-   Program[ condition] := {|| Counter == TheEnd }
-   Program[      body] := {|| Counter ++ }
+   Program[ condition ] := {|| Counter == TheEnd }
+   Program[      body ] := {|| Counter ++ }
    ? start := Second()
 
    // in Clipper :
-   // While !Program[ condition]:Eval() ; Program[ body]:Eval()
+   // WHILE ! Program[ condition ]:Eval() ; Program[ body ]:Eval()
    // why Harbour CodeBlocks don't have Eval() method ?!
 
    // Now It is supported.
 
-   DO WHILE ! Eval( Program[ condition] )
-      Eval( Program[ body] )
+   DO WHILE ! Eval( Program[ condition ] )
+      Eval( Program[ body ] )
    ENDDO
    ? stop := Second()
-   ? '==============='
+   ? "==============="
    ? stop - start
 
    RETURN
diff --git a/harbour/tests/speedtst.prg b/harbour/tests/speedtst.prg
index 17232f9354..a5a55714e7 100644
--- a/harbour/tests/speedtst.prg
+++ b/harbour/tests/speedtst.prg
@@ -174,12 +174,12 @@ proc main( _p01, _p02, _p03, _p04, _p05, _p06, _p07, _p08, _p09, _p10, ;
             elseif substr( cParam, 10 ) == "all"
                nMT := -1
             else
-               lSyntax = .t.
+               lSyntax := .t.
             endif
          elseif empty( substr( cParam, 9 ) )
             nMT := -1
          else
-            lSyntax = .t.
+            lSyntax := .t.
          endif
       elseif cParam = "--exclude="
          if substr( cParam, 11 ) == "mem"
@@ -203,7 +203,7 @@ proc main( _p01, _p02, _p03, _p04, _p05, _p06, _p07, _p08, _p09, _p10, ;
       elseif cParam == "--stdout"
          s_lStdOut := .t.
       else
-         lSyntax = .t.
+         lSyntax := .t.
       endif
       if lSyntax
          ? "Unknown option:", cParam
diff --git a/harbour/tests/stripem.prg b/harbour/tests/stripem.prg
index e1185d0d90..dff99d0bca 100644
--- a/harbour/tests/stripem.prg
+++ b/harbour/tests/stripem.prg
@@ -215,7 +215,7 @@ FUNCTION WriteLn( xTxt, lCRLF )
 
    if ::hFile == - 1
       QOut( "DosFile:Write : No file open" )
-   elseif ::cMode != 'W'
+   elseif ::cMode != "W"
       QOut( "File ", ::cFileName, " not opened for writing" )
    ELSE
       cBlock := ToChar( xTxt )                  // Convert to string
@@ -262,31 +262,31 @@ FUNCTION ToChar( xVal )
    LOCAL cType := ValType( xVal )
 
    DO CASE
-   CASE cType == 'U'
+   CASE cType == "U"
       RETURN "NIL"
 
-   CASE cType == 'A'
+   CASE cType == "A"
       RETURN "{}"
 
-   CASE cType == 'B'
+   CASE cType == "B"
       RETURN "{|| }"
 
-   CASE cType == 'C'
+   CASE cType == "C"
       RETURN xVal
 
-   CASE cType == 'D'
+   CASE cType == "D"
       RETURN DToC( xVal )
 
-   CASE cType == 'L'
+   CASE cType == "L"
       RETURN iif( xVal, ".T.", ".F." )
 
-   CASE cType == 'M'
+   CASE cType == "M"
       RETURN xVal
 
-   CASE cType == 'N'
+   CASE cType == "N"
       RETURN Str( xVal )
 
-   CASE cType == 'O'
+   CASE cType == "O"
       RETURN "{::}"
 
    ENDCASE
diff --git a/harbour/tests/switch.prg b/harbour/tests/switch.prg
index 492f1dd421..ffd1aa310c 100644
--- a/harbour/tests/switch.prg
+++ b/harbour/tests/switch.prg
@@ -3,14 +3,16 @@
  */
 
 #ifdef __XHARBOUR__
-   #define OTHERWISE DEFAULT
+#define OTHERWISE DEFAULT
 #endif
 
 PROCEDURE Main()
+
    LOCAL a := 1
    PRIVATE b := "b"
 
 #ifndef __XHARBOUR__
+
    SWITCH a
    END
 #endif
@@ -39,7 +41,7 @@ PROCEDURE Main()
       ? "FOUND: 1"
    CASE "2"
       ? "FOUND: 2"
-   OTHERWISE
+      OTHERWISE
       ? "other"
    END
 
@@ -47,47 +49,47 @@ PROCEDURE Main()
    ?
    ? "44444444444444444444444444444444444"
    SWITCH a
-   OTHERWISE
+      OTHERWISE
       ? "OTHERWISE"
    END
 #endif
 
    ?
    ? "55555555555555555555555555555555555"
-   a := 'EE'
+   a := "EE"
 #ifndef __XHARBOUR__
    SWITCH a
    CASE 11
       ? "11"
-      exit
+      EXIT
 
-   CASE 'CCCC'+'DDDD'
-      ? a+a
+   CASE "CCCC" + "DDDD"
+      ? a + a
       EXIT
 
    CASE "a&b"
-   CASE 1+1
-   CASE {11111111,22222222222}[1]
-   CASE 1+1+1
+   CASE 1 + 1
+   CASE { 11111111, 22222222222 }[1]
+   CASE 1 + 1 + 1
       ? "3"
       EXIT
 
-   CASE 1+1*3
-   CASE 123+12*4-1*4+2
-   CASE 1-4
+   CASE 1 + 1 * 3
+   CASE 123 + 12 * 4 - 1 * 4 + 2
+   CASE 1 - 4
       ? "4"
       EXIT
    CASE 123456789
    CASE 0
       EXIT
-   CASE 'AAAA'
-   CASE 'BBBBB'
+   CASE "AAAA"
+   CASE "BBBBB"
       ? a
       EXIT
-   CASE CHR(12)+CHR(15)
+   CASE Chr( 12 ) + Chr( 15 )
       ? "CHR()"
       EXIT
-   OTHERWISE
+      OTHERWISE
       ? "NOT FOUND: running OTHER"
    END
 #endif
@@ -101,14 +103,14 @@ PROCEDURE Main()
       ? a
       EXIT
    CASE "2"
-      SWITCH a+a
+      SWITCH a + a
       CASE 1
          ? "Nested FOUND 1"
          EXIT
       CASE "22"
          ? "Nested FOUND: 22"
          EXIT
-      OTHERWISE
+         OTHERWISE
          ? "Nested OTHERWISE"
       END
       ?? "In CASE 1"
diff --git a/harbour/tests/testbrw.prg b/harbour/tests/testbrw.prg
index 7980772e16..65193459c9 100644
--- a/harbour/tests/testbrw.prg
+++ b/harbour/tests/testbrw.prg
@@ -36,15 +36,15 @@ PROCEDURE Main()
    oBrowse:AddColumn( TBColumnNew( "Third",  {|| aTest1[ n ] } ) )
    oBrowse:AddColumn( TBColumnNew( "Forth",  {|| aTest2[ n ] } ) )
    oBrowse:AddColumn( TBColumnNew( "Fifth",  {|| aTest3[ n ] } ) )
-   oBrowse:GetColumn( 1 ):Footing := 'Number'
-   oBrowse:GetColumn( 2 ):Footing := 'Strins'
+   oBrowse:GetColumn( 1 ):Footing := "Number"
+   oBrowse:GetColumn( 2 ):Footing := "Strins"
 
-   oBrowse:GetColumn( 2 ):Picture := '@!'
+   oBrowse:GetColumn( 2 ):Picture := "@!"
 
-   oBrowse:GetColumn( 3 ):Footing := 'Number'
-   oBrowse:GetColumn( 3 ):Picture := '999,999.99'
-   oBrowse:GetColumn( 4 ):Footing := 'Dates'
-   oBrowse:GetColumn( 5 ):Footing := 'Logical'
+   oBrowse:GetColumn( 3 ):Footing := "Number"
+   oBrowse:GetColumn( 3 ):Picture := "999,999.99"
+   oBrowse:GetColumn( 4 ):Footing := "Dates"
+   oBrowse:GetColumn( 5 ):Footing := "Logical"
    // needed since I've changed some columns _after_ I've added them to TBrowse object
    oBrowse:Configure()
 
diff --git a/harbour/tests/testcdx.prg b/harbour/tests/testcdx.prg
index 937a093935..9c27333b9c 100644
--- a/harbour/tests/testcdx.prg
+++ b/harbour/tests/testcdx.prg
@@ -24,8 +24,8 @@ PROCEDURE Main()
    TESTDBF->( dbGoTop() )
    //   WHILE !TESTDBF->( Eof() )
    //      TESTCDX->( dbAppend() )
-   //      TESTCDX->CHARACTER = TESTDBF->FIRST
-   //      TESTCDX->NUMERIC = TESTDBF->SALARY
+   //      TESTCDX->CHARACTER := TESTDBF->FIRST
+   //      TESTCDX->NUMERIC := TESTDBF->SALARY
    //      TESTCDX->MEMO := TESTDBF->FIRST + Chr( 13 ) + Chr( 10 ) + ;
    //                       TESTDBF->LAST + Chr( 13 ) + Chr( 10 ) + ;
    //                       TESTDBF->STREET
diff --git a/harbour/tests/testdecl.prg b/harbour/tests/testdecl.prg
index 70e2c99c93..267d657ac0 100644
--- a/harbour/tests/testdecl.prg
+++ b/harbour/tests/testdecl.prg
@@ -38,7 +38,7 @@ INIT PROCEDURE Main()
    DECLARE Var1
    DECLARE Var2 := 2
    DECLARE aVar[2]
-   DECLARE Var3 := 'Var9', Var4, aVar5[1]
+   DECLARE Var3 := "Var9", Var4, aVar5[1]
    DECLARE Var6, Var7:=7, aVar8[8]
    DECLARE Var9
    DECLARE &var3
@@ -54,10 +54,10 @@ INIT PROCEDURE Main()
 
    ? M->Var2
 
-   M->aVar[1] := 'Array Element'
+   M->aVar[1] := "Array Element"
    ? M->aVar[1]
 
-   MyObj:cVar := 'Hello'
+   MyObj:cVar := "Hello"
    ? MyObj:cVar
 
    M->Var1 := MyClass():New()
diff --git a/harbour/tests/testhrb.prg b/harbour/tests/testhrb.prg
index b47517b135..85936159b0 100644
--- a/harbour/tests/testhrb.prg
+++ b/harbour/tests/testhrb.prg
@@ -25,7 +25,7 @@ PROCEDURE Main( x )
    //  ? "Loading(HB_HRB_BIND_LOCAL,'exthrb.hrb' )"
    //  pHrb := hb_HrbLoad(HB_HRB_BIND_LOCAL,"exthrb.hrb" )
 
-   ? "Loading(" + iif( n = 0, "HB_HRB_BIND_DEFAULT", iif( n = 1,"HB_HRB_BIND_LOCAL","HB_HRB_BIND_OVERLOAD" ) ) + ",'exthrb.hrb' )"
+   ? "Loading(" + iif( n == 0, "HB_HRB_BIND_DEFAULT", iif( n == 1,"HB_HRB_BIND_LOCAL","HB_HRB_BIND_OVERLOAD" ) ) + ",'exthrb.hrb' )"
    pHrb := hb_hrbLoad( n, "exthrb.hrb" )
 
    ? "========================="
diff --git a/harbour/tests/testpre.prg b/harbour/tests/testpre.prg
index 45082b614d..b9cf779c44 100644
--- a/harbour/tests/testpre.prg
+++ b/harbour/tests/testpre.prg
@@ -66,12 +66,12 @@ PROCEDURE Main()
                 'CLOSE ALL' }
 
    FOR j := 1 TO 2
-      QOut( iif( j = 1, "Before", "After" ) + " __pp_process()" )
+      QOut( iif( j == 1, "Before", "After" ) + " __pp_process()" )
       QOut( "===================" )
       QOut( "" )
       FOR i := 1 TO Len( aScript )
 
-         ? iif( j = 1, aScript[ i ], __pp_process( l_pp, aScript[ i ] ) )
+         ? iif( j == 1, aScript[ i ], __pp_process( l_pp, aScript[ i ] ) )
 
       NEXT
       QOut( "" )
diff --git a/harbour/tests/testwarn.prg b/harbour/tests/testwarn.prg
index d348cebe87..598f480789 100644
--- a/harbour/tests/testwarn.prg
+++ b/harbour/tests/testwarn.prg
@@ -84,15 +84,15 @@ PROCEDURE Main( optional )
   a := oB:aInstances[1]:oNext:cMyData2
   a := oB:aInstances[1]:oNext:cMyData
 
-  x := cOtherFunc( 'A' )
+  x := cOtherFunc( "A" )
   x := cOtherFunc( @Test )
-  x := cOtherFunc( 'A', 'A', 'A' )
+  x := cOtherFunc( "A", "A", "A" )
 
   M->TEST := "TEST"
 
-  a := 'A'
+  a := "A"
 
-  oB := 'a'
+  oB := "a"
 
   if lStatic
      Var1 := .F.
@@ -123,7 +123,7 @@ PROCEDURE SOMEPROC()
    Var1 := 1
 
    IF lGlobal = 0
-      ? 'lGlobal is NOT Numeric'
+      ? "lGlobal is NOT Numeric"
    ENDIF
 
    RETURN
@@ -151,9 +151,9 @@ FUNCTION Test()
 FUNCTION Main2()
    Local n As Numeric, lVar AS LOGICAL
 
-   n := iif( lVar, 'A', 3 ) // iif() needs to be completed.
+   n := iif( lVar, "A", 3 ) // iif() needs to be completed.
    n := 2
-   n := 'a'
+   n := "a"
    n := Seconds() + 2
    n := Int( seconds() + 2 )
 
@@ -183,11 +183,11 @@ FUNCTION Main3()
 
    n[2] := 4
 
-   cVar := {|nb AS NUMERIC , cb AS STRING, db AS DATE| n := .F., nb := 'A', cb := 1, db := 0, n := 'wrong type', 0 }
+   cVar := {|nb AS NUMERIC , cb AS STRING, db AS DATE| n := .F., nb := "A", cb := 1, db := 0, n := "wrong type", 0 }
 
    ? "This is a compiler test."
 
-   n := 'C is Wrong Type for n'
+   n := "C is Wrong Type for n"
 
    n := {1,2,3}
 
@@ -206,11 +206,11 @@ FUNCTION SomeTest( lVar AS LOGICAL )
 
    nVar := 1
 
-        nVar := 'A'
+        nVar := "A"
 
         cVar := 2
 
-   cVar := 'B'
+   cVar := "B"
 
         cVar := 2
 
@@ -241,7 +241,7 @@ FUNCTION nMyFunc( cVar AS STRING, nVar AS NUMERIC )
    RETURN nVar + 1
 
 FUNCTION cOtherFunc( )
-   RETURN 'Hello'
+   RETURN "Hello"
 
 FUNCTION ExtFun()
    RETURN 1
diff --git a/harbour/tests/tstalias.prg b/harbour/tests/tstalias.prg
index 2ddce4c6d5..8d6fcf093c 100644
--- a/harbour/tests/tstalias.prg
+++ b/harbour/tests/tstalias.prg
@@ -21,7 +21,7 @@ PROCEDURE Main()
    TEST->Age := 5
    ? FIELD->Age
 
-   TEST->( FieldPut( FieldPos( 'AGE' ), 6 ) )
+   TEST->( FieldPut( FieldPos( "AGE" ), 6 ) )
    ? FIELD->Age
 
    dbCloseArea()
diff --git a/harbour/tests/tstmacro.prg b/harbour/tests/tstmacro.prg
index e3b187ffe8..91f2e65ba9 100644
--- a/harbour/tests/tstmacro.prg
+++ b/harbour/tests/tstmacro.prg
@@ -9,36 +9,36 @@ MEMVAR cMainPrivate, GlobalPrivate, BornInRunTimeVar, Public
 
 PROCEDURE Main()
 
-   PRIVATE cStr := 'cVar', cStr_1 := 'cVar_1', aVar := { 'cVar_1' }, oVar
+   PRIVATE cStr := "cVar", cStr_1 := "cVar_1", aVar := { "cVar_1" }, oVar
 
-   PRIVATE cVar_1, cMainPrivate := 'cVar_1', GlobalPrivate := 'BornInRunTimeVar'
+   PRIVATE cVar_1, cMainPrivate := "cVar_1", GlobalPrivate := "BornInRunTimeVar"
 
-   &cStr_1 = 'Simple '
+   &cStr_1 := "Simple "
    ? M->cVar_1
 
-   &( 'cVar' + '_1' ) := 'Macro'
+   &( "cVar" + "_1" ) := "Macro"
    ?? M->cVar_1
 
-   M->&cStr_1 = 'Aliased'
+   M->&cStr_1 := "Aliased"
    ? M->cVar_1
 
-   MEMVAR->&( 'cVar' + '_1' ) := ' Macro'
+   MEMVAR->&( "cVar" + "_1" ) := " Macro"
    ?? M->cVar_1
 
-   cStr := 'cVar_'
-   &cStr.1 = 'Concatenated Macro (Numeric)'
+   cStr := "cVar_"
+   &cStr.1 := "Concatenated Macro (Numeric)"
    ? M->cVar_1
 
-   cStr := 'cVar'
-   &cStr._1 = 'Concatenated Macro (String)'
+   cStr := "cVar"
+   &cStr._1 := "Concatenated Macro (String)"
    ? M->cVar_1
 
-   &( aVar[1] ) := 'Array Macro'
+   &( aVar[1] ) := "Array Macro"
    ? M->cVar_1
 
    oVar := TValue():New()
-   oVar:cVal := 'cVar_1'
-   &( oVar:cVal ) := 'Class Macro'
+   oVar:cVal := "cVar_1"
+   &( oVar:cVal ) := "Class Macro"
    ? M->cVar_1
 
    SubFun()
@@ -78,20 +78,20 @@ FUNCTION SubFun()
    ? '"cVar_1" = [' + M->cVar_1 + '] BEFORE SubFun() PRIVATE'
 
    // Testing conflict with KEY WORDS
-   PRIVATE PRIVATE := 'I am a Var named PRIVATE ', &cMainPrivate, SomeVar, OtherVar := 1, &GlobalPrivate := 'I was born in Run Time'
-   PUBLIC PUBLIC := 'NewPublicVar'
+   PRIVATE PRIVATE := "I am a Var named PRIVATE ", &cMainPrivate, SomeVar, OtherVar := 1, &GlobalPrivate := "I was born in Run Time"
+   PUBLIC PUBLIC := "NewPublicVar"
    PUBLIC &PUBLIC
 
    ? M->NewPublicVar
 
-   M->NewPublicVar := 'Still Alive because I am PUBLIC'
+   M->NewPublicVar := "Still Alive because I am PUBLIC"
 
    ? M->PRIVATE + PRIVATE
    ? PRIVATE + M->PRIVATE
 
    ? BornInRunTimeVar
 
-   &cMainPrivate := 'In SubFun()'
+   &cMainPrivate := "In SubFun()"
 
    ? '"cVar_1" = [' + M->cVar_1 + '] in SubFun() PRIVATE'
 
diff --git a/harbour/tests/varparam.prg b/harbour/tests/varparam.prg
index 48f08ee480..581fc9d2ae 100644
--- a/harbour/tests/varparam.prg
+++ b/harbour/tests/varparam.prg
@@ -11,124 +11,124 @@ PROCEDURE Main( p1, p2 )
    LOCAL l1 := 11, l2 := 22, l3 := 33, l4 := 44, l5 := 55, l6 := 66
    PRIVATE iLoop
 
-   ? 'passed 0:  '; TEST_0_0( )
-   ? 'passed 1:  '; TEST_0_0( 1 )
-   ? 'passed 2:  '; TEST_0_0( 1, 2 )
-   ? 'passed 3:  '; TEST_0_0( 1, 2, 3 )
+   ? "passed 0:  "; TEST_0_0( )
+   ? "passed 1:  "; TEST_0_0( 1 )
+   ? "passed 2:  "; TEST_0_0( 1, 2 )
+   ? "passed 3:  "; TEST_0_0( 1, 2, 3 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_0_0v( )
-   ? 'passed 1:  '; TEST_0_0v( 1 )
-   ? 'passed 2:  '; TEST_0_0v( 1, 2 )
-   ? 'passed 3:  '; TEST_0_0v( 1, 2, 3 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_0_0v( )
+   ? "passed 1:  "; TEST_0_0v( 1 )
+   ? "passed 2:  "; TEST_0_0v( 1, 2 )
+   ? "passed 3:  "; TEST_0_0v( 1, 2, 3 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_1_0( )
-   ? 'passed 1:  '; TEST_1_0( 1 )
-   ? 'passed 2:  '; TEST_1_0( 1, 2 )
-   ? 'passed 3:  '; TEST_1_0( 1, 2, 3 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_1_0( )
+   ? "passed 1:  "; TEST_1_0( 1 )
+   ? "passed 2:  "; TEST_1_0( 1, 2 )
+   ? "passed 3:  "; TEST_1_0( 1, 2, 3 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_1_0v( )
-   ? 'passed 1:  '; TEST_1_0v( 1 )
-   ? 'passed 2:  '; TEST_1_0v( 1, 2 )
-   ? 'passed 3:  '; TEST_1_0v( 1, 2, 3 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_1_0v( )
+   ? "passed 1:  "; TEST_1_0v( 1 )
+   ? "passed 2:  "; TEST_1_0v( 1, 2 )
+   ? "passed 3:  "; TEST_1_0v( 1, 2, 3 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_1_1( )
-   ? 'passed 1:  '; TEST_1_1( 1 )
-   ? 'passed 2:  '; TEST_1_1( 1, 2 )
-   ? 'passed 3:  '; TEST_1_1( 1, 2, 3 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_1_1( )
+   ? "passed 1:  "; TEST_1_1( 1 )
+   ? "passed 2:  "; TEST_1_1( 1, 2 )
+   ? "passed 3:  "; TEST_1_1( 1, 2, 3 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_1_1v( )
-   ? 'passed 1:  '; TEST_1_1v( 1 )
-   ? 'passed 2:  '; TEST_1_1v( 1, 2 )
-   ? 'passed 3:  '; TEST_1_1v( 1, 2, 3 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_1_1v( )
+   ? "passed 1:  "; TEST_1_1v( 1 )
+   ? "passed 2:  "; TEST_1_1v( 1, 2 )
+   ? "passed 3:  "; TEST_1_1v( 1, 2, 3 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_1_3( )
-   ? 'passed 1:  '; TEST_1_3( 1 )
-   ? 'passed 2:  '; TEST_1_3( 1, 2 )
-   ? 'passed 3:  '; TEST_1_3( 1, 2, 3 )
-   ? 'passed 4:  '; TEST_1_3( 1, 2, 3, 4 )
-   ? 'passed 5:  '; TEST_1_3( 1, 2, 3, 4, 5 )
-   ? 'passed 6:  '; TEST_1_3( 1, 2, 3, 4, 5, 6 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_1_3( )
+   ? "passed 1:  "; TEST_1_3( 1 )
+   ? "passed 2:  "; TEST_1_3( 1, 2 )
+   ? "passed 3:  "; TEST_1_3( 1, 2, 3 )
+   ? "passed 4:  "; TEST_1_3( 1, 2, 3, 4 )
+   ? "passed 5:  "; TEST_1_3( 1, 2, 3, 4, 5 )
+   ? "passed 6:  "; TEST_1_3( 1, 2, 3, 4, 5, 6 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_1_3v( )
-   ? 'passed 1:  '; TEST_1_3v( 1 )
-   ? 'passed 2:  '; TEST_1_3v( 1, 2 )
-   ? 'passed 3:  '; TEST_1_3v( 1, 2, 3 )
-   ? 'passed 4:  '; TEST_1_3v( 1, 2, 3, 4 )
-   ? 'passed 5:  '; TEST_1_3v( 1, 2, 3, 4, 5 )
-   ? 'passed 6:  '; TEST_1_3v( 1, 2, 3, 4, 5, 6 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_1_3v( )
+   ? "passed 1:  "; TEST_1_3v( 1 )
+   ? "passed 2:  "; TEST_1_3v( 1, 2 )
+   ? "passed 3:  "; TEST_1_3v( 1, 2, 3 )
+   ? "passed 4:  "; TEST_1_3v( 1, 2, 3, 4 )
+   ? "passed 5:  "; TEST_1_3v( 1, 2, 3, 4, 5 )
+   ? "passed 6:  "; TEST_1_3v( 1, 2, 3, 4, 5, 6 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_3_0( )
-   ? 'passed 1:  '; TEST_3_0( 1 )
-   ? 'passed 2:  '; TEST_3_0( 1, 2 )
-   ? 'passed 3:  '; TEST_3_0( 1, 2, 3 )
-   ? 'passed 4:  '; TEST_3_0( 1, 2, 3, 4 )
-   ? 'passed 5:  '; TEST_3_0( 1, 2, 3, 4, 5 )
-   ? 'passed 6:  '; TEST_3_0( 1, 2, 3, 4, 5, 6 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_3_0( )
+   ? "passed 1:  "; TEST_3_0( 1 )
+   ? "passed 2:  "; TEST_3_0( 1, 2 )
+   ? "passed 3:  "; TEST_3_0( 1, 2, 3 )
+   ? "passed 4:  "; TEST_3_0( 1, 2, 3, 4 )
+   ? "passed 5:  "; TEST_3_0( 1, 2, 3, 4, 5 )
+   ? "passed 6:  "; TEST_3_0( 1, 2, 3, 4, 5, 6 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_3_0v( )
-   ? 'passed 1:  '; TEST_3_0v( 1 )
-   ? 'passed 2:  '; TEST_3_0v( 1, 2 )
-   ? 'passed 3:  '; TEST_3_0v( 1, 2, 3 )
-   ? 'passed 4:  '; TEST_3_0v( 1, 2, 3, 4 )
-   ? 'passed 5:  '; TEST_3_0v( 1, 2, 3, 4, 5 )
-   ? 'passed 6:  '; TEST_3_0v( 1, 2, 3, 4, 5, 6 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_3_0v( )
+   ? "passed 1:  "; TEST_3_0v( 1 )
+   ? "passed 2:  "; TEST_3_0v( 1, 2 )
+   ? "passed 3:  "; TEST_3_0v( 1, 2, 3 )
+   ? "passed 4:  "; TEST_3_0v( 1, 2, 3, 4 )
+   ? "passed 5:  "; TEST_3_0v( 1, 2, 3, 4, 5 )
+   ? "passed 6:  "; TEST_3_0v( 1, 2, 3, 4, 5, 6 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_3_3( )
-   ? 'passed 1:  '; TEST_3_3( 1 )
-   ? 'passed 2:  '; TEST_3_3( 1, 2 )
-   ? 'passed 3:  '; TEST_3_3( 1, 2, 3 )
-   ? 'passed 4:  '; TEST_3_3( 1, 2, 3, 4 )
-   ? 'passed 5:  '; TEST_3_3( 1, 2, 3, 4, 5 )
-   ? 'passed 6:  '; TEST_3_3( 1, 2, 3, 4, 5, 6 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_3_3( )
+   ? "passed 1:  "; TEST_3_3( 1 )
+   ? "passed 2:  "; TEST_3_3( 1, 2 )
+   ? "passed 3:  "; TEST_3_3( 1, 2, 3 )
+   ? "passed 4:  "; TEST_3_3( 1, 2, 3, 4 )
+   ? "passed 5:  "; TEST_3_3( 1, 2, 3, 4, 5 )
+   ? "passed 6:  "; TEST_3_3( 1, 2, 3, 4, 5, 6 )
 
-   ? '---------------------------------------'
-   ? 'passed 0:  '; TEST_3_3v( )
-   ? 'passed 1:  '; TEST_3_3v( 1 )
-   ? 'passed 2:  '; TEST_3_3v( 1, 2 )
-   ? 'passed 3:  '; TEST_3_3v( 1, 2, 3 )
-   ? 'passed 4:  '; TEST_3_3v( 1, 2, 3, 4 )
-   ? 'passed 5:  '; TEST_3_3v( 1, 2, 3, 4, 5 )
-   ? 'passed 6:  '; TEST_3_3v( 1, 2, 3, 4, 5, 6 )
+   ? "---------------------------------------"
+   ? "passed 0:  "; TEST_3_3v( )
+   ? "passed 1:  "; TEST_3_3v( 1 )
+   ? "passed 2:  "; TEST_3_3v( 1, 2 )
+   ? "passed 3:  "; TEST_3_3v( 1, 2, 3 )
+   ? "passed 4:  "; TEST_3_3v( 1, 2, 3, 4 )
+   ? "passed 5:  "; TEST_3_3v( 1, 2, 3, 4, 5 )
+   ? "passed 6:  "; TEST_3_3v( 1, 2, 3, 4, 5, 6 )
 
-   ? '---------------------------------------'
-   ? 'Passed 6 by ref:  '; TEST_0_0( @l1, @l2, @l3, @l4, @l5, @l6 )
-   ? 'Passed 6 by ref:  '; TEST_0_0v( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "---------------------------------------"
+   ? "Passed 6 by ref:  "; TEST_0_0( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "Passed 6 by ref:  "; TEST_0_0v( @l1, @l2, @l3, @l4, @l5, @l6 )
 
-   ? '---------------------------------------'
-   ? 'Passed 6 by ref:  '; TEST_1_0( @l1, @l2, @l3, @l4, @l5, @l6 )
-   ? 'Passed 6 by ref:  '; TEST_1_0v( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "---------------------------------------"
+   ? "Passed 6 by ref:  "; TEST_1_0( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "Passed 6 by ref:  "; TEST_1_0v( @l1, @l2, @l3, @l4, @l5, @l6 )
 
-   ? '---------------------------------------'
-   ? 'Passed 6 by ref:  '; TEST_1_1( @l1, @l2, @l3, @l4, @l5, @l6 )
-   ? 'Passed 6 by ref:  '; TEST_1_1v( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "---------------------------------------"
+   ? "Passed 6 by ref:  "; TEST_1_1( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "Passed 6 by ref:  "; TEST_1_1v( @l1, @l2, @l3, @l4, @l5, @l6 )
 
-   ? '---------------------------------------'
-   ? 'Passed 6 by ref:  '; TEST_1_3( @l1, @l2, @l3, @l4, @l5, @l6 )
-   ? 'Passed 6 by ref:  '; TEST_1_3v( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "---------------------------------------"
+   ? "Passed 6 by ref:  "; TEST_1_3( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "Passed 6 by ref:  "; TEST_1_3v( @l1, @l2, @l3, @l4, @l5, @l6 )
 
-   ? '---------------------------------------'
-   ? 'Passed 6 by ref:  '; TEST_3_0( @l1, @l2, @l3, @l4, @l5, @l6 )
-   ? 'Passed 6 by ref:  '; TEST_3_0v( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "---------------------------------------"
+   ? "Passed 6 by ref:  "; TEST_3_0( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "Passed 6 by ref:  "; TEST_3_0v( @l1, @l2, @l3, @l4, @l5, @l6 )
 
-   ? '---------------------------------------'
-   ? 'Passed 6 by ref:  '; TEST_3_3( @l1, @l2, @l3, @l4, @l5, @l6 )
-   ? 'Passed 6 by ref:  '; TEST_3_3v( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "---------------------------------------"
+   ? "Passed 6 by ref:  "; TEST_3_3( @l1, @l2, @l3, @l4, @l5, @l6 )
+   ? "Passed 6 by ref:  "; TEST_3_3v( @l1, @l2, @l3, @l4, @l5, @l6 )
 
    RETURN
 
 PROCEDURE TEST_0_0v( ... )
 
-   ?? ProcName( 0 ), ' received: ', PCount()
+   ?? ProcName( 0 ), " received: ", PCount()
    FOR m->iLoop := 1 TO PCount()
       ? m->iLoop, "=", hb_PValue( m->iLoop )
    NEXT
@@ -139,7 +139,7 @@ PROCEDURE TEST_0_0v( ... )
 
 PROCEDURE TEST_0_0( )
 
-   ?? ProcName( 0 ), ' received: ', PCount()
+   ?? ProcName( 0 ), " received: ", PCount()
    FOR m->iLoop := 1 TO PCount()
       ? m->iLoop, "=", hb_PValue( m->iLoop )
    NEXT
@@ -150,10 +150,10 @@ PROCEDURE TEST_0_0( )
 
 PROCEDURE TEST_1_0v( ... )
 
-   LOCAL i := 'i'
+   LOCAL i := "i"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'i=', i
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "i=", i
    FOR i := 1 TO PCount()
       ? i, "=", hb_PValue( i )
    NEXT
@@ -164,10 +164,10 @@ PROCEDURE TEST_1_0v( ... )
 
 PROCEDURE TEST_1_0( )
 
-   LOCAL i := 'i'
+   LOCAL i := "i"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'i=', i
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "i=", i
    FOR i := 1 TO PCount()
       ? i, "=", hb_PValue( i )
    NEXT
@@ -178,13 +178,13 @@ PROCEDURE TEST_1_0( )
 
 PROCEDURE TEST_1_3v( a, b, c, ... )
 
-   LOCAL i := 'i'
+   LOCAL i := "i"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'i=', i
-   ? 'a=', a
-   ? 'b=', b
-   ? 'c=', c
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "i=", i
+   ? "a=", a
+   ? "b=", b
+   ? "c=", c
    FOR i := 1 TO PCount()
       ? i, "=", hb_PValue( i )
    NEXT
@@ -199,13 +199,13 @@ PROCEDURE TEST_1_3v( a, b, c, ... )
 
 PROCEDURE TEST_1_3( a, b, c )
 
-   LOCAL i := 'i'
+   LOCAL i := "i"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'i=', i
-   ? 'a=', a
-   ? 'b=', b
-   ? 'c=', c
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "i=", i
+   ? "a=", a
+   ? "b=", b
+   ? "c=", c
    FOR i := 1 TO PCount()
       ? i, "=", hb_PValue( i )
    NEXT
@@ -220,11 +220,11 @@ PROCEDURE TEST_1_3( a, b, c )
 
 PROCEDURE TEST_1_1( a )
 
-   LOCAL i := 'i'
+   LOCAL i := "i"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'i=', i
-   ? 'a=', a
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "i=", i
+   ? "a=", a
    FOR i := 1 TO PCount()
       ? i, "=", hb_PValue( i )
    NEXT
@@ -235,11 +235,11 @@ PROCEDURE TEST_1_1( a )
 
 PROCEDURE TEST_1_1v( a, ... )
 
-   LOCAL i := 'i'
+   LOCAL i := "i"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'i=', i
-   ? 'a=', a
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "i=", i
+   ? "a=", a
    FOR i := 1 TO PCount()
       ? i, "=", hb_PValue( i )
    NEXT
@@ -250,15 +250,15 @@ PROCEDURE TEST_1_1v( a, ... )
 
 PROCEDURE TEST_3_3v( a, b, c, ... )
 
-   LOCAL x := 'x', y := 'y', z := 'z'
+   LOCAL x := "x", y := "y", z := "z"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'x=', x
-   ? 'y=', y
-   ? 'z=', z
-   ? 'a=', a
-   ? 'b=', b
-   ? 'c=', c
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "x=", x
+   ? "y=", y
+   ? "z=", z
+   ? "a=", a
+   ? "b=", b
+   ? "c=", c
    FOR m->iLoop := 1 TO PCount()
       ? m->iLoop, "=", hb_PValue( m->iLoop )
    NEXT
@@ -271,15 +271,15 @@ PROCEDURE TEST_3_3v( a, b, c, ... )
 
 PROCEDURE TEST_3_3( a, b, c )
 
-   LOCAL x := 'x', y := 'y', z := 'z'
+   LOCAL x := "x", y := "y", z := "z"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'x=', x
-   ? 'y=', y
-   ? 'z=', z
-   ? 'a=', a
-   ? 'b=', b
-   ? 'c=', c
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "x=", x
+   ? "y=", y
+   ? "z=", z
+   ? "a=", a
+   ? "b=", b
+   ? "c=", c
    FOR m->iLoop := 1 TO PCount()
       ? m->iLoop, "=", hb_PValue( m->iLoop )
    NEXT
@@ -292,12 +292,12 @@ PROCEDURE TEST_3_3( a, b, c )
 
 PROCEDURE TEST_3_0( )
 
-   LOCAL x := 'x', y := 'y', z := 'z'
+   LOCAL x := "x", y := "y", z := "z"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'x=', x
-   ? 'y=', y
-   ? 'z=', z
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "x=", x
+   ? "y=", y
+   ? "z=", z
    FOR m->iLoop := 1 TO PCount()
       ? m->iLoop, "=", hb_PValue( m->iLoop )
    NEXT
@@ -308,12 +308,12 @@ PROCEDURE TEST_3_0( )
 
 PROCEDURE TEST_3_0v( ... )
 
-   LOCAL x := 'x', y := 'y', z := 'z'
+   LOCAL x := "x", y := "y", z := "z"
 
-   ?? ProcName( 0 ), ' received: ', PCount()
-   ? 'x=', x
-   ? 'y=', y
-   ? 'z=', z
+   ?? ProcName( 0 ), " received: ", PCount()
+   ? "x=", x
+   ? "y=", y
+   ? "z=", z
    FOR m->iLoop := 1 TO PCount()
       ? m->iLoop, "=", hb_PValue( m->iLoop )
    NEXT
@@ -326,10 +326,10 @@ PROCEDURE TEST_REF( a, ... )
 
    LOCAL b
 
-   ? '@@@'
-   ? ProcName( 0 ), ' received: ', PCount()
-   ? 'a= ', a
-   ? 'b= ', b
+   ? "@@@"
+   ? ProcName( 0 ), " received: ", PCount()
+   ? "a= ", a
+   ? "b= ", b
    FOR EACH b IN hb_AParams( 0 )
       ? b:__enumindex, "-", b
    NEXT