use matrix to test against both SQL Server 2016 and 2008

appveyor.yml

@@ -1,13 +1,16 @@
 version: '{build}'
 
+init:
+  - cmd: net start MSSQL$%SQL_Instance%
+
 environment:
-  mssql_jdbc_test_connection_properties: jdbc:sqlserver://localhost:1433;instanceName=SQL2016;databaseName=master;username=sa;password=Password12!;
+  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  mssql_jdbc_test_connection_properties: jdbc:sqlserver://localhost:1433;instanceName=%SQL_Instance%;databaseName=master;username=sa;password=Password12!;
+
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 
+    - SQL_Instance: SQL2008R2SP2
+    - SQL_Instance: SQL2016
 
-services:
-  - mssql2016
-
 install:
   - ps: Write-Host 'Installing JCE with powershell'
   - ps: cd AppVeyorJCE

src/test/java/com/microsoft/sqlserver/jdbc/datatypes/SQLVariantResultSetTest.java

@@ -386,8 +386,9 @@ public void readvarBinary8000() throws SQLException, SecurityException, IOExcept
     public void readSQLVariantProperty() throws SQLException, SecurityException, IOException {
         String value = "hi";
         createAndPopulateTable("binary(8000)", "'" + value + "'");
-        rs = (SQLServerResultSet) stmt.executeQuery("SELECT SQL_VARIANT_PROPERTY(col1,'BaseType') AS 'Base Type',"
-                + " SQL_VARIANT_PROPERTY(col1,'Precision') AS 'Precision' from " + tableName);
+        rs = (SQLServerResultSet) stmt.executeQuery(
+                "SELECT SQL_VARIANT_PROPERTY(col1,'BaseType') AS 'Base Type', SQL_VARIANT_PROPERTY(col1,'Precision') AS 'Precision' from "
+                        + tableName);
         rs.next();
         assertTrue(rs.getString(1).equalsIgnoreCase("binary"), "unexpected baseType, expected: binary, retrieved:" + rs.getString(1));
     }

src/test/java/com/microsoft/sqlserver/jdbc/preparedStatement/BatchExecutionWithNullTest.java

@@ -117,13 +117,11 @@ public void testSetup() throws TestAbortedException, Exception {
 
     @AfterAll
     public static void terminateVariation() throws SQLException {
+        connection = DriverManager.getConnection(connectionString);
 
         SQLServerStatement stmt = (SQLServerStatement) connection.createStatement();
         Utils.dropTableIfExists("esimple", stmt);
 
-        if (null != connection) {
-            connection.close();
-        }
         if (null != pstmt) {
             pstmt.close();
         }
@@ -136,5 +134,8 @@ public static void terminateVariation() throws SQLException {
         if (null != rs) {
             rs.close();
         }
+        if (null != connection) {
+            connection.close();
+        }
     }
 }