diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/FindFunctionTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/FindFunctionTests.java
deleted file mode 100644
index b6e9b4d01..000000000
--- a/main/tests/server/src/com/google/refine/tests/expr/functions/FindFunctionTests.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2018, OpenRefine contributors
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
-package com.google.refine.tests.expr.functions;
-
-import java.util.Properties;
-import java.util.regex.Pattern;
-
-import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
-
-import com.google.refine.RefineServlet;
-import com.google.refine.grel.ControlFunctionRegistry;
-import com.google.refine.grel.Function;
-import com.google.refine.tests.RefineServletStub;
-import com.google.refine.tests.RefineTest;
-
-/**
- * Test cases for find function.
- */
-public class FindFunctionTests extends RefineTest {
-    static Properties bindings;
-    
-    @Override
-    @BeforeTest
-    public void init() {
-        logger = LoggerFactory.getLogger(this.getClass());
-    }
-
-    // dependencies
-    RefineServlet servlet;
-
-    @BeforeMethod
-    public void SetUp() {
-        bindings = new Properties();
-        
-        servlet = new RefineServletStub();
-    }
-    
-    @AfterMethod
-    public void TearDown() {
-    }
-
-    
-    @Test
-    public void findFunctionFindAllTest() throws Exception {
-        String[] matches = (String[]) invoke("find", "This is a test string for testing find.", "test");
-        Assert.assertEquals(matches[0], "test");
-        Assert.assertEquals(matches[1], "test");
-    }
-    
-    @Test
-    public void findFunctionFindLiteralTest() throws Exception {
-        String[] matches = (String[]) invoke("find", "This is a test string for testing find.", ".test");
-        Assert.assertEquals(matches.length, 0);
-    }
-    
-    @Test
-    public void findFunctionFindRegexTest() throws Exception {
-        String[] matches = (String[]) invoke("find", "hello 123456 goodbye.", Pattern.compile("\\d{6}|hello"));
-        Assert.assertEquals(matches[0], "hello");
-        Assert.assertEquals(matches[1], "123456");
-    }
-    
-    /**
-     * Lookup a control function by name and invoke it with a variable number of args
-     */
-    private static Object invoke(String name,Object... args) {
-        // registry uses static initializer, so no need to set it up
-        Function function = ControlFunctionRegistry.getFunction(name);
-        if (function == null) {
-            throw new IllegalArgumentException("Unknown function "+name);
-        }
-        if (args == null) {
-            return function.call(bindings,new Object[0]);
-        } else {
-            return function.call(bindings,args);
-        }
-    }
-}
diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java
index ee08d9a24..16eeba143 100644
--- a/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java
+++ b/main/tests/server/src/com/google/refine/tests/expr/functions/strings/FindTests.java
@@ -26,16 +26,90 @@
  ******************************************************************************/
 package com.google.refine.tests.expr.functions.strings;
 
+import java.util.Properties;
+import java.util.regex.Pattern;
+
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
+import com.google.refine.RefineServlet;
 import com.google.refine.expr.functions.strings.Find;
+import com.google.refine.grel.ControlFunctionRegistry;
+import com.google.refine.grel.Function;
+import com.google.refine.tests.RefineServletStub;
+import com.google.refine.tests.RefineTest;
 import com.google.refine.tests.util.TestUtils;
 
-public class FindTests {
+/**
+ * Test cases for find function.
+ */
+public class FindTests extends RefineTest {
+    static Properties bindings;
+    
+    @Override
+    @BeforeTest
+    public void init() {
+        logger = LoggerFactory.getLogger(this.getClass());
+    }
+
+    // dependencies
+    RefineServlet servlet;
+
+    @BeforeMethod
+    public void SetUp() {
+        bindings = new Properties();
+        
+        servlet = new RefineServletStub();
+    }
+    
+    @AfterMethod
+    public void TearDown() {
+    }
+
+    
+    @Test
+    public void findFunctionFindAllTest() throws Exception {
+        String[] matches = (String[]) invoke("find", "This is a test string for testing find.", "test");
+        Assert.assertEquals(matches[0], "test");
+        Assert.assertEquals(matches[1], "test");
+    }
+    
+    @Test
+    public void findFunctionFindLiteralTest() throws Exception {
+        String[] matches = (String[]) invoke("find", "This is a test string for testing find.", ".test");
+        Assert.assertEquals(matches.length, 0);
+    }
+    
+    @Test
+    public void findFunctionFindRegexTest() throws Exception {
+        String[] matches = (String[]) invoke("find", "hello 123456 goodbye.", Pattern.compile("\\d{6}|hello"));
+        Assert.assertEquals(matches[0], "hello");
+        Assert.assertEquals(matches[1], "123456");
+    }
+    
     @Test
     public void serializeFind() {
         String json = "{\"description\":\"Returns all the occurances of match given regular expression\",\"params\":\"string or regexp\",\"returns\":\"array of strings\"}";
         TestUtils.isSerializedTo(new Find(), json);
     }
+    
+    /**
+     * Lookup a control function by name and invoke it with a variable number of args
+     */
+    private static Object invoke(String name,Object... args) {
+        // registry uses static initializer, so no need to set it up
+        Function function = ControlFunctionRegistry.getFunction(name);
+        if (function == null) {
+            throw new IllegalArgumentException("Unknown function "+name);
+        }
+        if (args == null) {
+            return function.call(bindings,new Object[0]);
+        } else {
+            return function.call(bindings,args);
+        }
+    }
 }
-