diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java
index e1905b5c0..84138e438 100644
--- a/main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java
+++ b/main/tests/server/src/com/google/refine/tests/expr/functions/date/IncTests.java
@@ -20,8 +20,13 @@ import com.google.refine.tests.RefineTest;
 
 
 public class IncTests extends RefineTest {
-
-    static Properties bindings;
+    private static Properties bindings;
+    private DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+            .append(DateTimeFormatter.BASIC_ISO_DATE).appendLiteral('-')
+            .appendPattern("HH:mm:ss")
+            .appendPattern("[.SSSSSSSSS][.SSSSSS][.SSS]")       // optional nanos, with 9, 6 or 3 digits
+            .appendOffset("+HH:mm", "Z")
+            .toFormatter();
     
     @Override
     @BeforeTest
@@ -30,12 +35,12 @@ public class IncTests extends RefineTest {
     }
     
     @BeforeMethod
-    public void SetUp() {
+    public void setUp() {
         bindings = new Properties();
     }
 
     @AfterMethod
-    public void TearDown() {
+    public void tearDown() {
         bindings = null;
     }
     
@@ -55,13 +60,6 @@ public class IncTests extends RefineTest {
         }
     }
     
-    private DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-            .append(DateTimeFormatter.BASIC_ISO_DATE).appendLiteral('-')
-            .appendPattern("HH:mm:ss")
-            .appendPattern("[.SSSSSSSSS][.SSSSSS][.SSS]")       // optional nanos, with 9, 6 or 3 digits
-            .appendOffset("+HH:mm", "Z")
-            .toFormatter();
-
     @Test
     public void testInc() {        
         OffsetDateTime source = OffsetDateTime.parse("20180510-23:55:44.000789000Z",
diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java
index 43bdf95f9..0a103d54f 100644
--- a/main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java
+++ b/main/tests/server/src/com/google/refine/tests/expr/functions/date/NowTests.java
@@ -18,8 +18,13 @@ import com.google.refine.tests.RefineTest;
 
 
 public class NowTests extends RefineTest {
-
-    static Properties bindings;
+    private static Properties bindings;
+    private DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+            .append(DateTimeFormatter.BASIC_ISO_DATE).appendLiteral('-')
+            .appendPattern("HH:mm:ss")
+            .appendPattern("[.SSSSSSSSS][.SSSSSS][.SSS]")       // optional nanos, with 9, 6 or 3 digits
+            .appendOffset("+HH:mm", "Z")
+            .toFormatter();
     
     @Override
     @BeforeTest
@@ -28,12 +33,12 @@ public class NowTests extends RefineTest {
     }
     
     @BeforeMethod
-    public void SetUp() {
+    public void setUp() {
         bindings = new Properties();
     }
 
     @AfterMethod
-    public void TearDown() {
+    public void tearDown() {
         bindings = null;
     }
     
@@ -53,13 +58,6 @@ public class NowTests extends RefineTest {
         }
     }
     
-    private DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-            .append(DateTimeFormatter.BASIC_ISO_DATE).appendLiteral('-')
-            .appendPattern("HH:mm:ss")
-            .appendPattern("[.SSSSSSSSS][.SSSSSS][.SSS]")       // optional nanos, with 9, 6 or 3 digits
-            .appendOffset("+HH:mm", "Z")
-            .toFormatter();
-    
     @Test
     public void testNow() {        
         // 2018-4-30 23:55:44