--- ibx/trunk/fbintf/testsuite/Test16.pas	2021/02/25 11:27:14	314
+++ ibx/trunk/fbintf/testsuite/Test16.pas	2021/02/25 11:56:36	315
@@ -1,3 +1,31 @@
+(*
+ *  Firebird Interface (fbintf) Test suite. This program is used to
+ *  test the Firebird Pascal Interface and provide a semi-automated
+ *  pass/fail check for each test.
+ *
+ *  The contents of this file are subject to the Initial Developer's
+ *  Public License Version 1.0 (the "License"); you may not use this
+ *  file except in compliance with the License. You may obtain a copy
+ *  of the License here:
+ *
+ *    http://www.firebirdsql.org/index.php?op=doc&id=idpl
+ *
+ *  Software distributed under the License is distributed on an "AS
+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ *  implied. See the License for the specific language governing rights
+ *  and limitations under the License.
+ *
+ *  The Initial Developer of the Original Code is Tony Whyman.
+ *
+ *  The Original Code is (C) 2016 Tony Whyman, MWA Software
+ *  (http://www.mwasoftware.co.uk).
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): ______________________________________.
+ *
+*)
+
 unit Test16;
 {$IFDEF MSWINDOWS} 
 {$DEFINE WINDOWS} 
@@ -27,13 +55,13 @@ unit Test16;
 interface
 
 uses
-  Classes, SysUtils, TestManager, IB;
+  Classes, SysUtils, TestApplication, FBTestApp, IB;
 
 type
 
   { TTest16 }
 
-  TTest16 = class(TTestBase)
+  TTest16 = class(TFBTestBase)
   private
     procedure DBTests(CharSet: AnsiString; SQLDialect: integer);
     procedure ServiceTests(CharSet: AnsiString; SQLDialect: integer);
@@ -127,12 +155,12 @@ end;
 procedure TTest16.ServiceTests(CharSet: AnsiString; SQLDialect: integer);
 var SPB: ISPB;
     Service: IServiceManager;
-    I: integer;
     ServerName: AnsiString;
     DBName: AnsiString;
 begin
   if not FirebirdAPI.HasServiceAPI then Exit;
 
+  DBName := ExtractDBName(Owner.GetEmployeeDatabaseName);
   ServerName := Owner.Server;
 
   SPB := FirebirdAPI.AllocateSPB;