diff --git a/OpenRefine/.github/dependabot.yml b/OpenRefine/.github/dependabot.yml
index 7cb4af948..9d57a9ca1 100644
--- a/OpenRefine/.github/dependabot.yml
+++ b/OpenRefine/.github/dependabot.yml
@@ -14,16 +14,30 @@ updates:
     versions:
     - "> 1.4.12"
     - "< 2"
+    
+# Same, on 4.0 branch
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: com.thoughtworks.xstream:xstream
+    versions:
+    - "> 1.4.12"
+    - "< 2"
+  target-branch: 4.0
+    
 # For documentation website
 - package-ecosystem: "npm" # For Yarn
   directory: "docs/"
   schedule:
-    interval: "daily"
+    interval: "monthly"
 # For github actions
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:
-    interval: "daily"
+    interval: "monthly"
 # For cypress test_suite
 - package-ecosystem: "npm"
   directory: "main/tests/cypress"
diff --git a/OpenRefine/.github/workflows/pull_request.yml b/OpenRefine/.github/workflows/pull_request.yml
index 040b89872..151fcaff7 100644
--- a/OpenRefine/.github/workflows/pull_request.yml
+++ b/OpenRefine/.github/workflows/pull_request.yml
@@ -14,7 +14,7 @@ jobs:
   server_tests:
     strategy:
       matrix:
-        java: [ 11, 14 ]
+        java: [ 11, 17 ]
 
     runs-on: ubuntu-latest
 
@@ -64,6 +64,11 @@ jobs:
         distribution: 'adopt'
         java-version: ${{ matrix.java }}
 
+    - name: Check Java linting
+      id: java_linting
+      run: |
+        mvn formatter:validate
+
     - name: Configure connections to databases
       id: configure_db_connections
       run: cat extensions/database/tests/conf/github_actions_tests.xml | sed -e "s/MYSQL_PORT/${{ job.services.mysql.ports[3306] }}/g" | sed -e "s/POSTGRES_PORT/${{ job.services.postgres.ports[5432] }}/g" > extensions/database/tests/conf/tests.xml
diff --git a/OpenRefine/AUTHORS.md b/OpenRefine/AUTHORS.md
deleted file mode 100644
index 418836118..000000000
--- a/OpenRefine/AUTHORS.md
+++ /dev/null
@@ -1,78 +0,0 @@
-This file lists the contributors to OpenRefine.
-
-EMERITUS CREATORS 
----------------------
-No longer active but honored for bringing OpenRefine to life.
- - David Huynh 
- - Stefano Mazzocchi 
- 
-EMERITUS CONTRIBUTORS 
----------------------
-No longer active but honored here for their previous contributions
-
- - Vishal Talwar 
- - Jeff Fry 
- - Will Moffat 
- - James Home 
- - Heather Campbell 
- 
-CURRENT CONTRIBUTORS 
---------------------
-
-See up to date list at https://github.com/OpenRefine/OpenRefine/graphs/contributors
-
- - Iain Sproat 
- - Tom Morris 
- - Thad Guidry 
- - Martin Magdinier 
- - Paul Makepeace 
- - Tomaž Šolc 
- - Gabriel Sjoberg 
- - Rod Salazar 
- - pxb 
- - Qi 
- - Antonin Delpeuch 
- - Owen Stephens 
- - Ettore Rizza 
- - Fabio Tacchelli 
- - noamoss
- - ROMitat
- - Jesus M. Castagnetto
- - Pablo Moyano 
- - David Leoni
- - Cora Johnson-Roberson
- - Pei Long Hui
- - Rudy Alvarez 
- - Mateja Verlic Bruncic
- - nestorjal 
- - Alexey Medvetsky 
- - Remi Rampin 
- - lispc 
- - Bob Harper
- - Felix Lohmeier 
- - Shixiong Zhu
- - Ankit Sardesai
- - Scott Wiedemann
- - Ryo Yamazaki
- - Ralf Claussnitzer
- - Charles Pritchard
- - Maxim Galushka
- - Evelyn Mitchell
- - Andreas Kohn
- - Honza
- - Ram Ezrach 
- - Daniel Berthereau 
- - Gideon Thomas 
- - José Vitor Hisse
- - Vitor Baptista 
- - Joe Wicentowski 
- - mpc9000
- - Dan Michael O. 
- - Adi Eyal
- - Shrubhra Sharma
- - Fadi Maali 
- - Aubrey Mcfato 
- - Matthias Findeisen
- - Mathieu Saby
- - Allan Nordhøy 
- - Tony Opara 
diff --git a/OpenRefine/CHANGES.txt b/OpenRefine/CHANGES.txt
deleted file mode 100644
index 0a4cd3615..000000000
--- a/OpenRefine/CHANGES.txt
+++ /dev/null
@@ -1,284 +0,0 @@
-2.6 Release (TBD) - First release as OpenRefine - Maintenance release
-
-Features:
-
-- Issue 144: Use subdirectory for archives (tar, zip)
-- Issue 467: Provide feedback to user on JVM heap memory usage
-- Issue 524: Shorten name of anonymous JSON nodes in column names
-
-Bugs fixed:
-
-- Issue 154: Can't import RDF/XML Data
-- Issue 226: Load into freebase: date objects are not converted into proper freebase dates
-- Issue 361: Headless operation on OS X leaves Dock icon bouncing
-- Issue 390: Latest POI fixes some import issues
-- Issue 432: cross() failing
-- Issue 436: Google refine don't start on debian squeeze
-- Issue 490: Unable to guess filetype is CSV when importing a simple CSV file
-- Issue 496: google-refine-2.5-rc2-r2379 failed to start if using refine.ini
-- Issue 515: "Open Project" page shows negative interval for "Last Modified"
-- Issue 517: Combin() function does not work as intended
-- Issue 521: Machine readable string (/type/rawstring) missing
-- Issue 523: Return all available HTTP error information on when Fetch URL fails
-- Issue 535: Refine fails to import Excel 2010 XLSX file with null hyperlinks
-- Issue 537: ToNumber should try to convert to integer first
-- Issue 541: Can't constrain a Freebase key query when using add column
-- Issue 542: ToDate should work on integers
-- Issue 543: Project creation from URL can't handle gzip Content-Encoding
-- Issue 544: FileNotFound exception when importing archive from URL
-- Issue 548: escape(value, encoding) returns "null" for non-string values
-- Issue 551: MQL preview missing "insert" clause
-- Issue 553: Upload Error - Not a directory
-- Issue 554: Format guesser ranking isn't working correctly in some cases
-- Issue 558: 'refine windows_dist' does not work on MacOS Lion
-- Issue 559: Deadlock between autosave thread and history code
-- Issue 578: json import on create project deletes useful blank data from arrays
-- Issue 586: Only one parse date format is attempted from list in toDate(format1,format2)
-- Issue 594: Date diff function doesn't work for two Calendar objects
-- Issue 596: JSON importer should not deserialize nulls as the string "null"
-- Issue 597: Deselect all button on Custom Tabular Exporter dialog doesn't work
-- Issue 599: RDF/XML parser preview not wired up
-- Issue 601: Allow selection of root element on JSON import
-- Issue 604: The common transform “Trim leading and trailing whitespace” doesn’t trim non-breaking spaces
-
-
-2.5 Release (December 11, 2011)
-
-Major changes:
-- Entirely new importer architecture and user interface for Create Project
-- New import/export formats: Google Fusion Tables, OpenOffice Calc, 
-  and fixed width (import only)
-
-Features:
-
-- Issue 131: Read multiple files in a directory
-- Issue 179: Progress feedback during upload
-- Issue 260: XML Importer silently fails if file doesn't meet its criteria
-- Issue 279: Add support for reading from non-public Google Spreadsheets docs
-- Issue 280: Spreadsheet/table importers should allow selection of sheet/table to import
-- Issue 281: Add sheet selection support to Google Spreadsheet importer
-- Issue  31: Maximum number of facet values should be configurable.
-- Issue  38: Fix the table header so that it's always visible when scrolling a long page
-- Issue 433: Usability: use HTML <label> (e.g., for checkboxes
-- Issue 447: Extend toTitlecase() function with support for char[] delimiters in Apache WordUtils
-- Issue 452: Importing using Clipboard function does not guess structure correctly for XML or JSON
-- Issue 483: Project custom metadata while importing 
-- Issue 504: Allow "sort" keyword in constraint subquery for "Add from Freebase"
-- Issue  84: Add a cut and paste textbox importer
-- Issue  85: Fixed width column importer
-- Issue  88: Improve operation history robustness by fixing Json.
-- Issue  92: Add Columns From Freebase dialog should support constraints
-- Issue  97: Exporting CSV should allow for optional columns
-
-Bugs fixed:
-
-- Issue 149: rows button stays strike-through when clicking on it
-- Issue 229: 'Ignore lines on import' bug when import from URL?
-- Issue 232: Stray characters before <?xml> (including blank lines) causes XML import to fail
-- Issue 233: 404 Error upon Launch
-- Issue 313: Excel export loses date cell format
-- Issue 314: Reconciliation (Freebase) of accented characters doesn't work
-- Issue 330: On Project creation - Unchecked Split Columns Box still splits by comma
-- Issue 366: Error when using Add column from Freebase on restored project
-- Issue 375: Importing data from Google spreadsheet via visualisation API query
-- Issue 378: Transform involving NaN causes crash
-- Issue 383: Updating Preview hangs on 2.5 branch when checking Load at most...
-- Issue 410: Convert line-endings to DOS format
-- Issue 419: Values with Characters like é split across several lines
-- Issue 424: Duplicate column names don't allow user to recover
-- Issue 426: filter with custom facet adds zero lines choice
-- Issue 428: Excel import sometimes drops last row of data
-- Issue 430: Timeline Facet not working
-- Issue 435: refine sh script only checks for java 1.6, not > 1.6
-- Issue 440: Fetch URLs aborts while saving/loading/computing facets
-- Issue 441: onError - "keep-original" / "store-blank" working oddly for value.toDate()
-- Issue 442: Two column transforms to date on the same column turns the cells blank
-- Issue 449: Uncaught exception from Excel importer
-- Issue 450: Parse error uploading to Fusion Table
-- Issue 454: Reselect Files after Configuring Parsing Options does not allow Select
-- Issue 459: Undefined error with some CSV files (incorrectly detected as EXCEL) 
-- Issue 462: Don't trim whitespace in Excel importer
-- Issue 465: Data text file with extension .dta within a .ZIP is not automatically extracted
-- Issue 473: Cancel button doesn't work during project creation
-- Issue 474: XML importer ignores record limit
-- Issue 475: New Importer does not accept special separator characters completely such as Unicode chars
-- Issue 477: Implement or remove the line separator option
-- Issue 487: Transform -> To Date doesn't support ISO 8601 date parsing
-- Issue 488: ISO 8601 dates not supported in cell editing - cell-ui.js
-- Issue 489: Custom Exporter no longer behaves as expected with line & field separators
-- Issue 491: Importing Excel files - blank columns and time formatting
-- Issue 492: Table header cells misaligning with table cells
-- Issue 502: Fetch URLs does not return the exact HTTP payload, like Create Project from URLs does.
-- Issue 513: No more Json Tokens in stream ERROR
-
-
-2.1 Release (July 10, 2011) - Maintenance release
-
-Features:
-
-- Issue 157: Google Spreadsheet import/export plugin integrated
-- Issue 220: HTML parsing functions added to GREL (using Jsoup)
-- Issue 222: Added the ability to save favorite transforms
-- Issue 224: added ABS math function
-- Issue 349: Clustering not finding duplicates when facet is showing groupings
-- Issue 399: Added Cologne Phonetic clustering for German names
-
-Bugs fixed:
-
-- Issue 102: Process-Panel div sometimes disappears in Google Chrome
-- Issue 107: Reconciliation options not showing international characters correctly
-- Issue 143: Windows refine.bat file gives NoClassDefFoundError
-- Issue 163: Refine doesn't retain the characters for flat or sharp
-- Issue 172: inconsistencies in encoding guessing during load
-- Issue 184: Support formatting dates into strings
-- Issue 185: same reconciliation candidate for two cells seems to be overridden
-- Issue 187: Linux start instruction incorrect
-- Issue 188: ArrayIndexOutOfBoundsException when importing excel file
-- Issue 196: failure and error dialog attempting to remove columns
-- Issue 197: New project was modified "0 years ago"
-- Issue 202: Sort text with accents
-- Issue 203: Please add TextPipe to Related Software page
-- Issue 227: Documentation states extensions are mounted at /extensions, but they are really mounted at /extension.
-- Issue 228: Import .zip archive fails
-- Issue 237: reinterpret() no longer seems to work as expected
-- Issue 258: JAVA_HOME ignored if "which java" returns nonzero
-- Issue 262: Refine does not start
-- Issue 263: & symbol being parsed in url's in xml
-- Issue 276: strange character while create new project with a chinese project name
-- Issue 294: Exporting date type column to TSV/CSV shows java debugging information instead of value
-- Issue 295: Binaries under 'root' user on *nix
-- Issue 304: CsvExporter tests fail after commit for issue 294
-- Issue 311: "Ignore" and "Skip" fields in the "Create a New Project" form have the same input[name]
-- Issue 312: toString(date_val, 'yyyy-MM-dd') doesn't seem to work
-- Issue 325: Refine cannot load data from URL when run behind Proxy Server
-- Issue 328: Don't retry failed key-based reconciliations
-- Issue 334: Fusion Tables CSV import produces NullPointerException
-- Issue 351: Error 500 STREAM on Excel export
-- Issue 355: Broken images for SchemaAlignment page
-- Issue 358: org.json.JSONException: JSON does not allow non-finite numbers.
-- Issue 364: Build is broken
-- Issue 374: Problems with date functions INC
-- Issue 391: Patch to refine.{bat,ini}
-- Issue 401: Error in exception handling for ExportRows command
-- Issue 404: Intermittent charset detection failure
-- Issue 415: Evaluation precedence wrong for arithmetic expressions
-- Issue 61: multiple rows per column from 1 xml element
-
-
-2.0 Release  (November 10, 2010 - first release as Google Refine)
-
-Major Changes:
-- New extension architecture.
-- Generalized reconciliation framework that allows plugging in standard reconciliation services.
-- Support for QA on data loads into Freebase.
-- Timeline Facet (Issue 40 and 95)
-
-Features:
-- New commands:
-  - Fill Down
-  - Blank Down
-  - Transpose Cells in Columns into Rows
-  - Transpose Cells in Rows into Columns (Issue 82)
-  - Move Column to Beginning, Move Column to End, Move Column Left, Move Column Right, Reorder Columns
-  - Add Column by Fetching URLs
-  - Recon commands:
-    - Clear recon data for all matching rows
-    - Clear recon data for one cell
-    - Clear recon data for similar cells
-    - Copy recon judgments across columns
-- GREL:
-  - JSON support
-  - New functions: smartSplit, escape, parseJson, hasField, uniques
-  - New controls: forEachIndex, forRange, filter
-  - New parameters:
-    - preserveAllTokens on split function
-  - Regexp groups capturing GEL function
-- Importers
-  - New: RDF exporter (as extension)
-  - New: Json importer
-  - CSV and TSV importers: added support for ignoring quotation marks
-  - Added support for creating a project by pointing to a data file URL.
-- Text facet's choice count limit is now configurable through preference page
-- Select All and Unselect All buttons in History Extract dialog
-- Schema skeleton: support for multiple cells per cell-as nodes, and for conditional links
-- Optionally convert strings to numbers during split columns operation
-
-Fixes:
-- TSV/CSV exporter bug: Gridworks crashed when there were empty cells.
-- Issue  29: Delivered "Collapse whitespace" transformation does not work
-- Issue  57: Schema skeleton disappears	 
-- Issue  66: Records not excluded with inverted text facet
-- Issue  69: ControlFunctionRegistry now correctly registers Chomp expression as "chomp" key.
-- Issue  99: Diff for dates fails with "unknown error" always
-- Issue 110: Import of single column text file with Postal Codes shows only 1 row with lots of � chars (?)
-- Issue 113: Export filtered rows as tsv or csv fails; html and excel OK
-- Issue 115: datePart(value,"month") gives zero-based month numbers	 
-- Issue 116: CSV/TSV export data includes blank fields for deleted columns
-- Issue 121: Importing attached file strips backslashes
-- Issue 122: Exporting to Excel on attached project raises server exception
-- Issue 125: jsonize not serializing arrays	 
-- Issue 126: Large integers formatted in scientific notation in formulas
-- Issue 127: Add column from Freebase raises exception	 
-- Issue 135: Hangs when setting cell value to large JSON string
-- Issue 138: Numbers should be right-justified
-- Issue 140: Fix Open Workspace Directory command to work on Windows and Linux	 
-- Issue 146: In "Cluster and Edit Column", clicking on entry value to set "Merge?" checkbox does not reflect the final value of operation
-- Issue 155: Blank browser shown when non-GZIP format is detected during import	 
-- Issue 160: Cancel button on Search for Match dialog sometimes not working
-- Issue 161: Authorize error when trying to Sign In before loading to Freebase
-- Issue 166: Expression Editor dialog needs UI cleanup on long expressions	 
-
-
-1.1 Release (May 27, 2010)
-
-Features:
-- Row/record sorting (Issue 32)
-- CSV exporter (Issue 59)
-- Mqlwrite exporter
-- Templating exporter (experimental)
-
-Fixes:
-- Issue 34: "Behavior of Text Filter is unpredictable when "regular expression" mode is enabled."
-  Regex was not compiled with case insensitivity flag.
-- Issue 4: "Match All bug with ZIP code". Numeric values in cells were not stringified first
-  before comparison.
-- Issue 41: "Envelope quotation marks are removed by CSV importer"
-- Issue 19: "CSV import is too basic"
-- Issue 15: "Ability to rename projects"
-- Issue 16: "Column name collision when adding data from Freebase"
-- Issue 28: "mql-like preview is not properly unquoting numbers"
-- Issue 45: "Renaming Cells with Ctrl-Enter produced ERROR"
-  Tentative fix for a concurrent bug.
-- Issue 46: "Array literals in GEL"
-- Issue 55: "Use stable sorting for text facets sorted by count"
-- Issue 53: "Moving the cursor inside the Text Filter box by clicking"
-- Issue 58: "Meta facet"
-  Supported by the function facetCount()
-- Issue 14: "Limiting Freebase load to starred records"
-  We load whatever rows that are filtered through, not particularly starred rows.
-- Issue 49: "Add Edit Cells / Set Null"
-- Issue 30: "Transform dialog should remember preferred language."
-- Issue 62: "It'd be nice if URIs were hyperlinked in the data cells"
-
-Other Changes:
-- Moved unit tests from JUnit to TestNG
-
-
-1.0.1 Release (May 12, 2010)
-
-Fixes:
-- Issue 2: "Undo History bug" - bulk row starring and flagging operations could not be undone.
-- Issue 5: "Localized Windows cause save problems for Gridworks" -
-  Windows user IDs that contain unicode characters were not retrieved correctly.
-- Issue 10: "OAuth fails on sign in" - due to clock offset.
-- Issue 11: "missing "lang" attribute in MQL generated in schema alignment"
-- Issue 13: "float rejected from sandbox upload as Json object" - everything was sent as a string.
-- Issue 17: "Conflated triples - all rows are producing triple with "s" :" $Name_0"" -
-  The Create A New Topic for Each Cell command created shared recon objects.
-- Issue 18: "Error converting russian characters during edit of single cell"
-- [partial fix] Issue 19: "CSV import is too basic" - fixed for CSV, not for TSV
-
-1.0 Release (May 10, 2010)
-
-First Public Release as Freebase Gridworks
-
diff --git a/OpenRefine/IDEs/eclipse/Refine.style.xml b/OpenRefine/IDEs/eclipse/Refine.style.xml
index 8efba4750..63c8a5f8e 100644
--- a/OpenRefine/IDEs/eclipse/Refine.style.xml
+++ b/OpenRefine/IDEs/eclipse/Refine.style.xml
@@ -1,269 +1,390 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="OpenRefine" version="11">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-</profile>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="21">
+    <profile kind="CodeFormatterProfile" name="OpenRefine" version="21">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
 </profiles>
diff --git a/OpenRefine/README.md b/OpenRefine/README.md
index 3f06d04b4..228946dd9 100644
--- a/OpenRefine/README.md
+++ b/OpenRefine/README.md
@@ -1,13 +1,3 @@
-# MultiUserOpenRefine
-![MultiUserOpenRefine](logo.svg)
-
-MultiUserOpenRefine is an extension to open-source tool that, in addition to
-all the features described below, allows creating user accounts, each providing
-private workspace and leaving the convenience of running the basic OpenRefine 
-tool on a remote server.
-
-Project is being developed at Adam Mickiewicz University in Poznań by students.
-
 # OpenRefine
 
 [![DOI](https://zenodo.org/badge/6220644.svg)](https://zenodo.org/badge/latestdoi/6220644)
@@ -27,8 +17,8 @@ the web. All from a web browser and the comfort and privacy of your own computer
 
 Latest development version, packaged for:
 * [Linux](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.6-SNAPSHOT&c=linux&p=tar.gz)
-* [Windows](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.6-SNAPSHOT&c=mac&p=dmg)
-* [MacOS](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.6-SNAPSHOT&c=win&p=zip)
+* [MacOS](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.6-SNAPSHOT&c=mac&p=dmg)
+* [Windows](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.6-SNAPSHOT&c=win&p=zip)
 
 ## Run from source
 
@@ -72,4 +62,4 @@ was acquired by Google, Inc. in July 2010 and the product was renamed Google Ref
 In October 2012, it was renamed OpenRefine as it transitioned to a
 community-supported product.
 
-See [AUTHORS.md](./AUTHORS.md) for the list of OpenRefine contributors and [CONTRIBUTING.md](./CONTRIBUTING.md) for instructions on how to contribute yourself.
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for instructions on how to contribute yourself.
diff --git a/OpenRefine/SECURITY.md b/OpenRefine/SECURITY.md
index 385ead408..5fc1181b9 100644
--- a/OpenRefine/SECURITY.md
+++ b/OpenRefine/SECURITY.md
@@ -4,8 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 3.4.x   | :white_check_mark: |
-| <= 3.3   | :x:                |
+| 3.5.x   | :white_check_mark: |
+| <= 3.4   | :x:                |
 
 ## Reporting a Vulnerability
 
diff --git a/OpenRefine/WeLoveOurBackers.md b/OpenRefine/WeLoveOurBackers.md
deleted file mode 100644
index 646ce2431..000000000
--- a/OpenRefine/WeLoveOurBackers.md
+++ /dev/null
@@ -1,8 +0,0 @@
-An evergrowing list of our forever immortalized OpenRefine Backers that we LOVE because they help support further development !
-
-1. Owen Stephens - Wiki contributor, extension author, and supporting you in our mailing list.
-2. PaulZH -
-3. Jens Willmer -
-4. mroswell -
-5. Google News Initiative - https://newsinitiative.withgoogle.com/
-6. Chan Zuckerberg Initiative - https://chanzuckerberg.com/
diff --git a/OpenRefine/benchmark/pom.xml b/OpenRefine/benchmark/pom.xml
index f000d1556..56cf7a872 100644
--- a/OpenRefine/benchmark/pom.xml
+++ b/OpenRefine/benchmark/pom.xml
@@ -48,7 +48,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jmh.version>1.33</jmh.version>
+    <jmh.version>1.34</jmh.version>
     <javac.target>${java.minversion}</javac.target>
     <uberjar.name>openrefine-benchmarks</uberjar.name>
   </properties>
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.9.0</version>
         <configuration>
           <compilerVersion>${javac.target}</compilerVersion>
           <source>${javac.target}</source>
@@ -119,7 +119,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
+          <version>${maven-jar-plugin.version}</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -131,7 +131,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.9.1</version>
+          <version>3.10.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
diff --git a/OpenRefine/benchmark/src/main/java/org/openrefine/benchmark/ToNumberBenchmark.java b/OpenRefine/benchmark/src/main/java/org/openrefine/benchmark/ToNumberBenchmark.java
index 456986fd9..ee55a2e79 100644
--- a/OpenRefine/benchmark/src/main/java/org/openrefine/benchmark/ToNumberBenchmark.java
+++ b/OpenRefine/benchmark/src/main/java/org/openrefine/benchmark/ToNumberBenchmark.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package org.openrefine.benchmark;
 
 import java.util.Properties;
@@ -53,15 +54,15 @@ public class ToNumberBenchmark {
     @State(Scope.Benchmark)
     public static class ExecutionPlan {
 
-        @Param({"1000", "10000" })
+        @Param({ "1000", "10000" })
         public int iterations;
-        
+
         public ToNumber f;
         String[] args = new String[1];
-        String testData; 
+        String testData;
         String testDataInt;
         Random rnd = new Random();
-        
+
         @Setup(Level.Invocation)
         public void setUp() {
             f = new ToNumber();
@@ -73,8 +74,8 @@ public class ToNumberBenchmark {
     @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
-	@Warmup(iterations = 3, time = 200, timeUnit = TimeUnit.MILLISECONDS)
-	@Measurement(iterations = 5, time = 200, timeUnit = TimeUnit.MILLISECONDS)
+    @Warmup(iterations = 3, time = 200, timeUnit = TimeUnit.MILLISECONDS)
+    @Measurement(iterations = 5, time = 200, timeUnit = TimeUnit.MILLISECONDS)
     public void toDoubleNew(ExecutionPlan plan, Blackhole blackhole) {
         plan.args[0] = plan.testData;
         blackhole.consume(plan.f.call(bindings, plan.args));
@@ -83,12 +84,11 @@ public class ToNumberBenchmark {
     @Benchmark
     @BenchmarkMode(Mode.AverageTime)
     @OutputTimeUnit(TimeUnit.NANOSECONDS)
-	@Warmup(iterations = 3, time = 200, timeUnit = TimeUnit.MILLISECONDS)
-	@Measurement(iterations = 5, time = 200, timeUnit = TimeUnit.MILLISECONDS)
-	@Fork(1)
+    @Warmup(iterations = 3, time = 200, timeUnit = TimeUnit.MILLISECONDS)
+    @Measurement(iterations = 5, time = 200, timeUnit = TimeUnit.MILLISECONDS)
+    @Fork(1)
     public void toLongNew(ExecutionPlan plan, Blackhole blackhole) {
-            plan.args[0] = plan.testDataInt;
-            blackhole.consume(plan.f.call(bindings, plan.args));
+        plan.args[0] = plan.testDataInt;
+        blackhole.consume(plan.f.call(bindings, plan.args));
     }
 }
-
diff --git a/OpenRefine/docs/README.md b/OpenRefine/docs/README.md
index f5f180a90..777db3d07 100644
--- a/OpenRefine/docs/README.md
+++ b/OpenRefine/docs/README.md
@@ -5,7 +5,7 @@ We use [Docusaurus 2](https://v2.docusaurus.io/) for our docs, a modern static w
 
 ### Requirements
 
-Assuming you have [Node.js](https://nodejs.org/en/download/) installed (which includes npm), you can install Docusaurus with:
+Assuming you have [Node.js (LTS recommended)](https://nodejs.org/en/download/) installed (which includes npm), you can install Docusaurus with:
 
 You will need to install [Yarn](https://yarnpkg.com/getting-started/install) before you can build the site.
 
@@ -66,6 +66,18 @@ yarn build
 ```
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.
+### (Optional) Test Build Locally
+You can locally test ([with parameters](https://docusaurus.io/docs/cli#docusaurus-serve-sitedir)) the static content in the `build` directory (in case you don't have access to a hosting service) by using:
+
+```sh
+yarn serve
+```
+
+or to build and then serve locally with one command:
+
+```sh
+yarn serve --build
+```
 
 ### Deployment
 
diff --git a/OpenRefine/docs/docs/manual/installing.md b/OpenRefine/docs/docs/manual/installing.md
index b740b3290..74db80926 100644
--- a/OpenRefine/docs/docs/manual/installing.md
+++ b/OpenRefine/docs/docs/manual/installing.md
@@ -20,7 +20,7 @@ OpenRefine is designed to work with **Windows**, **Mac**, and **Linux** operatin
 
 If you install and start OpenRefine on a Windows computer without Java, it will automatically open up a browser window to the [Java downloads page](https://java.com/en/download/), and you can simply follow the instructions there.
 
-We recommend you [download](https://java.com/en/download/) and install Java before proceeding with the OpenRefine installation. Please note that OpenRefine works with Java 8 to Java 15 but not Java 16 or later versions.
+We recommend you [download](https://java.com/en/download/) and install Java before proceeding with the OpenRefine installation. Please note that OpenRefine 3.5 works with Java 8 to Java 17.
 
 #### Compatible browser {#compatible-browser}
 
diff --git a/OpenRefine/docs/docs/manual/running.md b/OpenRefine/docs/docs/manual/running.md
index 1155e68de..e23317562 100644
--- a/OpenRefine/docs/docs/manual/running.md
+++ b/OpenRefine/docs/docs/manual/running.md
@@ -321,7 +321,7 @@ From the home screen, look in the options to the left for <span class="menuItems
 To leave the Language Settings screen, click on the diamond “OpenRefine” logo.
 
 :::info Help us Translate OpenRefine
-We use Weblate to provide translations for the interface. You can check [our profile on Weblate](https://hosted.weblate.org/projects/openrefine/translations/) to see which languages are in the process of being supported. See [our technical reference if you are interested in contributing translation work](https://docs.openrefine.org/technical-reference/translating) to make OpenRefine accessible to people in other languages.
+We use Weblate to provide translations for the interface. You can check [our profile on Weblate](https://hosted.weblate.org/projects/openrefine/translations/) to see which languages are in the process of being supported. See [our technical reference if you are interested in contributing translation work](../technical-reference/translating-ui) to make OpenRefine accessible to people in other languages.
 :::
 
 ### Preferences {#preferences}
diff --git a/OpenRefine/docs/docs/manual/sortview.md b/OpenRefine/docs/docs/manual/sortview.md
index a45a4b887..fbb52717c 100644
--- a/OpenRefine/docs/docs/manual/sortview.md
+++ b/OpenRefine/docs/docs/manual/sortview.md
@@ -33,3 +33,9 @@ You can control what data you view in the grid. On each column, you will see a <
 You can find, under <span class="menuItems">All</span> → <span class="menuItems">View</span>, the option to show and hide [“null” values](exploring#data-types). A small grey “null” will appear in each applicable cell. Remember that a null cell is not the same thing as an empty cell. 
 
 ![A screenshot of what a null value looks like.](/img/null.png)
+
+## Page navigation {#page-navigation}
+
+You can go directly to any page by changing the page number on the right-hand side. Using the up and down arrow keys in this input lets you go to the next and previous pages. You can also change the number of rows or records per page on the left-hand side of this view header bar.
+
+![A screenshot of the Page Navigation Feature.](/img/goto.png)
diff --git a/OpenRefine/docs/docs/manual/troubleshooting.md b/OpenRefine/docs/docs/manual/troubleshooting.md
index 76508f043..5388fc351 100644
--- a/OpenRefine/docs/docs/manual/troubleshooting.md
+++ b/OpenRefine/docs/docs/manual/troubleshooting.md
@@ -22,8 +22,8 @@ If you don’t find your problem and solution there, continue on to the resource
     *   Then, if you wish, you can create a Github issue.
 
 ### If you want to contribute: {#if-you-want-to-contribute}
-*   [Help us translate the tool into more languages](https://docs.openrefine.org/technical-reference/translating), using Weblate
-*   [We have a guide to contributing](technical-reference/contributing) in the [Technical Reference](technical-reference/technical-reference-index) section
+*   [Help us translate the tool into more languages](../technical-reference/translating-ui), using Weblate
+*   [We have a guide to contributing](../technical-reference/contributing) in the [Technical Reference](../technical-reference/technical-reference-index) section
 *   Contribute your feature requests in the [User forum](https://groups.google.com/g/openrefine) or as [Github issues](https://github.com/OpenRefine/OpenRefine/issues/new/choose)
 *   Join the User Forum and/or the [Developer Forum](https://groups.google.com/g/openrefine-dev)
 *   Share your successes and use cases with us, in the User forum
diff --git a/OpenRefine/docs/docs/technical-reference/build-test-run.md b/OpenRefine/docs/docs/technical-reference/build-test-run.md
index 33117c694..300784ac8 100644
--- a/OpenRefine/docs/docs/technical-reference/build-test-run.md
+++ b/OpenRefine/docs/docs/technical-reference/build-test-run.md
@@ -230,6 +230,13 @@ Right click on the `server` subproject, click `Run as...` and `Run configuration
 
 This will add a run configuration that you can then use to run OpenRefine from Eclipse.
 
+## Code style in Eclipse
+
+You can apply the supplied Eclipse code style (in `IDEs/eclipse/Refine.style.xml`) to make sure Eclipse lints your files according to the existing style.
+Pull requests deviating from this style will fail in the CI.
+
+You can manually apply the code style (regardless of your IDE) with the `mvn formatter:format` command.
+
 ## Testing in Eclipse {#testing-in-eclipse}
 
 You can run the server tests directly from Eclipse. To do that you need to have the TestNG launcher plugin installed, as well as the TestNG M2E plugin (for integration with Maven). If you don't have it, you can get it by [installing new software](https://help.eclipse.org/2020-03/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-129.htm) from this update URL http://dl.bintray.com/testng-team/testng-eclipse-release/
diff --git a/OpenRefine/docs/docs/technical-reference/contributing.md b/OpenRefine/docs/docs/technical-reference/contributing.md
index 23a66da14..a9151abf7 100644
--- a/OpenRefine/docs/docs/technical-reference/contributing.md
+++ b/OpenRefine/docs/docs/technical-reference/contributing.md
@@ -61,6 +61,8 @@ This describes the overall steps to your first code contribution in OpenRefine.
 
 - Make changes to the code to fix the issue. If you are changing backend code, it would be great if you could also write a test in Java to demonstrate the fix. You can imitate existing tests for that. We currently do not have frontend tests.
 
+- If you made Java changes, run linting to make sure they conform to our code style, with `mvn formatter:format`.
+
 - commit your changes, using a message that contains one of the special words "closes" and "fixes" which are detected by Github, followed by the issue number, e.g. "closes #1234" or "fixes #1234", this will link the commit to the issue you are working on.
 
 - push your branch to your fork and create a pull request for it, explaining the approach you have used, any design decisions you have made.
diff --git a/OpenRefine/docs/docs/technical-reference/version-release-process.md b/OpenRefine/docs/docs/technical-reference/version-release-process.md
index 0cf0b88df..3f86ab7d6 100644
--- a/OpenRefine/docs/docs/technical-reference/version-release-process.md
+++ b/OpenRefine/docs/docs/technical-reference/version-release-process.md
@@ -10,7 +10,7 @@ When releasing a new version of Refine, the following steps should be followed:
 2. Change the version number in [RefineServlet.java](http://github.com/OpenRefine/OpenRefine/blob/master/main/src/com/google/refine/RefineServlet.java#L62) and in the POM files using `mvn versions:set -DnewVersion=2.6-beta -DgenerateBackupPoms=false`. Commit the changes.
 3. Compose the list of changes in the code and on the wiki. If the issues have been updated with the appropriate milestone, the Github issue tracker should be able to provide a good starting point for this.
 4. Set up build machine. This needs to be Mac OS X or Linux.
-5. Download Windows and Mac JREs to bundle them in the Windows and Mac packages from [AdoptOpenJDK](https://adoptopenjdk.net/). You only need the JREs, not the JDKs. Use the lowest version of Java supported (Java 8 currently). Configure the location of these JREs in the `settings.xml` file at the root of the repository. It is important to download recent versions of the JREs as this impacts which HTTPS certificates are accepted by the tool.
+5. Download Windows and Mac JREs to bundle them in the Windows and Mac packages from [AdoptOpenJDK](https://adoptopenjdk.net/). You only need the JREs, not the JDKs. Use the lowest version of Java supported (Java 11 currently). Configure the location of these JREs in the `settings.xml` file at the root of the repository. It is important to download recent versions of the JREs as this impacts which HTTPS certificates are accepted by the tool.
 6. Insert the production Google credentials in https://github.com/OpenRefine/OpenRefine/blob/bc540a880eceb88e54f85ca43eb54769de3bfa4f/extensions/gdata/src/com/google/refine/extension/gdata/GoogleAPIExtension.java#L36-L39 without committing the changes.
 7. [Build the release candidate kits using the shell script (not just Maven)](https://github.com/OpenRefine/OpenRefine/wiki/Building-OpenRefine-From-Source). This must be done on Mac OS X or Linux to be able to build all 3 kits. On Linux you will need to install the `genisoimage` program first. 
 ```shell
diff --git a/OpenRefine/docs/static/img/goto.png b/OpenRefine/docs/static/img/goto.png
new file mode 100644
index 000000000..256ff9b9e
Binary files /dev/null and b/OpenRefine/docs/static/img/goto.png differ
diff --git a/OpenRefine/docs/versioned_docs/version-3.4/manual/running.md b/OpenRefine/docs/versioned_docs/version-3.4/manual/running.md
index 378ca07c0..725d5a1fe 100644
--- a/OpenRefine/docs/versioned_docs/version-3.4/manual/running.md
+++ b/OpenRefine/docs/versioned_docs/version-3.4/manual/running.md
@@ -319,7 +319,7 @@ From the home screen, look in the options to the left for <span class="menuItems
 To leave the Language Settings screen, click on the diamond “OpenRefine” logo.
 
 :::info Help us Translate OpenRefine
-We use Weblate to provide translations for the interface. You can check [our profile on Weblate](https://hosted.weblate.org/projects/openrefine/translations/) to see which languages are in the process of being supported. See [our technical reference if you are interested in contributing translation work](https://docs.openrefine.org/technical-reference/translating) to make OpenRefine accessible to people in other languages.
+We use Weblate to provide translations for the interface. You can check [our profile on Weblate](https://hosted.weblate.org/projects/openrefine/translations/) to see which languages are in the process of being supported. See [our technical reference if you are interested in contributing translation work](../technical-reference/translating) to make OpenRefine accessible to people in other languages.
 :::
 
 ### Preferences {#preferences}
diff --git a/OpenRefine/docs/versioned_docs/version-3.4/manual/troubleshooting.md b/OpenRefine/docs/versioned_docs/version-3.4/manual/troubleshooting.md
index 76508f043..67b4aef6c 100644
--- a/OpenRefine/docs/versioned_docs/version-3.4/manual/troubleshooting.md
+++ b/OpenRefine/docs/versioned_docs/version-3.4/manual/troubleshooting.md
@@ -22,8 +22,8 @@ If you don’t find your problem and solution there, continue on to the resource
     *   Then, if you wish, you can create a Github issue.
 
 ### If you want to contribute: {#if-you-want-to-contribute}
-*   [Help us translate the tool into more languages](https://docs.openrefine.org/technical-reference/translating), using Weblate
-*   [We have a guide to contributing](technical-reference/contributing) in the [Technical Reference](technical-reference/technical-reference-index) section
+*   [Help us translate the tool into more languages](../technical-reference/translating), using Weblate
+*   [We have a guide to contributing](../technical-reference/contributing) in the [Technical Reference](../technical-reference/technical-reference-index) section
 *   Contribute your feature requests in the [User forum](https://groups.google.com/g/openrefine) or as [Github issues](https://github.com/OpenRefine/OpenRefine/issues/new/choose)
 *   Join the User Forum and/or the [Developer Forum](https://groups.google.com/g/openrefine-dev)
 *   Share your successes and use cases with us, in the User forum
diff --git a/OpenRefine/docs/versioned_docs/version-3.5/manual/installing.md b/OpenRefine/docs/versioned_docs/version-3.5/manual/installing.md
index 88aac9d37..bf280a3e3 100644
--- a/OpenRefine/docs/versioned_docs/version-3.5/manual/installing.md
+++ b/OpenRefine/docs/versioned_docs/version-3.5/manual/installing.md
@@ -20,7 +20,7 @@ OpenRefine is designed to work with **Windows**, **Mac**, and **Linux** operatin
 
 If you install and start OpenRefine on a Windows computer without Java, it will automatically open up a browser window to the [Java downloads page](https://java.com/en/download/), and you can simply follow the instructions there.
 
-We recommend you [download](https://java.com/en/download/) and install Java before proceeding with the OpenRefine installation. Please note that OpenRefine works with Java 8 to Java 15 but not Java 16 or later versions.
+We recommend you [download](https://java.com/en/download/) and install Java before proceeding with the OpenRefine installation. Please note that OpenRefine works with Java 8 to Java 17 for OpenRefine 3.5.
 
 #### Compatible browser {#compatible-browser}
 
diff --git a/OpenRefine/docs/versioned_docs/version-3.5/manual/running.md b/OpenRefine/docs/versioned_docs/version-3.5/manual/running.md
index 1155e68de..e23317562 100644
--- a/OpenRefine/docs/versioned_docs/version-3.5/manual/running.md
+++ b/OpenRefine/docs/versioned_docs/version-3.5/manual/running.md
@@ -321,7 +321,7 @@ From the home screen, look in the options to the left for <span class="menuItems
 To leave the Language Settings screen, click on the diamond “OpenRefine” logo.
 
 :::info Help us Translate OpenRefine
-We use Weblate to provide translations for the interface. You can check [our profile on Weblate](https://hosted.weblate.org/projects/openrefine/translations/) to see which languages are in the process of being supported. See [our technical reference if you are interested in contributing translation work](https://docs.openrefine.org/technical-reference/translating) to make OpenRefine accessible to people in other languages.
+We use Weblate to provide translations for the interface. You can check [our profile on Weblate](https://hosted.weblate.org/projects/openrefine/translations/) to see which languages are in the process of being supported. See [our technical reference if you are interested in contributing translation work](../technical-reference/translating-ui) to make OpenRefine accessible to people in other languages.
 :::
 
 ### Preferences {#preferences}
diff --git a/OpenRefine/docs/versioned_docs/version-3.5/manual/sortview.md b/OpenRefine/docs/versioned_docs/version-3.5/manual/sortview.md
index a45a4b887..4e6bcb715 100644
--- a/OpenRefine/docs/versioned_docs/version-3.5/manual/sortview.md
+++ b/OpenRefine/docs/versioned_docs/version-3.5/manual/sortview.md
@@ -33,3 +33,9 @@ You can control what data you view in the grid. On each column, you will see a <
 You can find, under <span class="menuItems">All</span> → <span class="menuItems">View</span>, the option to show and hide [“null” values](exploring#data-types). A small grey “null” will appear in each applicable cell. Remember that a null cell is not the same thing as an empty cell. 
 
 ![A screenshot of what a null value looks like.](/img/null.png)
+
+## Page navigation {#page-navigation}
+
+You can go directly to any page by changing the page number on the right-hand side. Using the up and down arrow keys in this input lets you go to the next and previous pages. You can also change the number of rows or records per page on the left-hand side of this view header bar.
+ 
+![A screenshot of the Page Navigation Feature.](/img/goto.png)
diff --git a/OpenRefine/docs/versioned_docs/version-3.5/manual/troubleshooting.md b/OpenRefine/docs/versioned_docs/version-3.5/manual/troubleshooting.md
index 76508f043..5388fc351 100644
--- a/OpenRefine/docs/versioned_docs/version-3.5/manual/troubleshooting.md
+++ b/OpenRefine/docs/versioned_docs/version-3.5/manual/troubleshooting.md
@@ -22,8 +22,8 @@ If you don’t find your problem and solution there, continue on to the resource
     *   Then, if you wish, you can create a Github issue.
 
 ### If you want to contribute: {#if-you-want-to-contribute}
-*   [Help us translate the tool into more languages](https://docs.openrefine.org/technical-reference/translating), using Weblate
-*   [We have a guide to contributing](technical-reference/contributing) in the [Technical Reference](technical-reference/technical-reference-index) section
+*   [Help us translate the tool into more languages](../technical-reference/translating-ui), using Weblate
+*   [We have a guide to contributing](../technical-reference/contributing) in the [Technical Reference](../technical-reference/technical-reference-index) section
 *   Contribute your feature requests in the [User forum](https://groups.google.com/g/openrefine) or as [Github issues](https://github.com/OpenRefine/OpenRefine/issues/new/choose)
 *   Join the User Forum and/or the [Developer Forum](https://groups.google.com/g/openrefine-dev)
 *   Share your successes and use cases with us, in the User forum
diff --git a/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/build-test-run.md b/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/build-test-run.md
index 33117c694..300784ac8 100644
--- a/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/build-test-run.md
+++ b/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/build-test-run.md
@@ -230,6 +230,13 @@ Right click on the `server` subproject, click `Run as...` and `Run configuration
 
 This will add a run configuration that you can then use to run OpenRefine from Eclipse.
 
+## Code style in Eclipse
+
+You can apply the supplied Eclipse code style (in `IDEs/eclipse/Refine.style.xml`) to make sure Eclipse lints your files according to the existing style.
+Pull requests deviating from this style will fail in the CI.
+
+You can manually apply the code style (regardless of your IDE) with the `mvn formatter:format` command.
+
 ## Testing in Eclipse {#testing-in-eclipse}
 
 You can run the server tests directly from Eclipse. To do that you need to have the TestNG launcher plugin installed, as well as the TestNG M2E plugin (for integration with Maven). If you don't have it, you can get it by [installing new software](https://help.eclipse.org/2020-03/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-129.htm) from this update URL http://dl.bintray.com/testng-team/testng-eclipse-release/
diff --git a/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/contributing.md b/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/contributing.md
index 23a66da14..a9151abf7 100644
--- a/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/contributing.md
+++ b/OpenRefine/docs/versioned_docs/version-3.5/technical-reference/contributing.md
@@ -61,6 +61,8 @@ This describes the overall steps to your first code contribution in OpenRefine.
 
 - Make changes to the code to fix the issue. If you are changing backend code, it would be great if you could also write a test in Java to demonstrate the fix. You can imitate existing tests for that. We currently do not have frontend tests.
 
+- If you made Java changes, run linting to make sure they conform to our code style, with `mvn formatter:format`.
+
 - commit your changes, using a message that contains one of the special words "closes" and "fixes" which are detected by Github, followed by the issue number, e.g. "closes #1234" or "fixes #1234", this will link the commit to the issue you are working on.
 
 - push your branch to your fork and create a pull request for it, explaining the approach you have used, any design decisions you have made.
diff --git a/OpenRefine/docs/yarn.lock b/OpenRefine/docs/yarn.lock
index f97857b88..17141b3f5 100644
--- a/OpenRefine/docs/yarn.lock
+++ b/OpenRefine/docs/yarn.lock
@@ -1432,9 +1432,9 @@
     to-fast-properties "^2.0.0"
 
 "@crowdin/cli@3":
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/@crowdin/cli/-/cli-3.7.2.tgz#709597ead041359b213e0804d4c8b9f8f8a14dcd"
-  integrity sha512-dM7pQLHo10XnHvi0RAkOFAwqn/LB4NE42njn4dHSu8O30zLgsVbCEq4KvUajE2aFz0mDeAzMgxjEDJSssFUf2Q==
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@crowdin/cli/-/cli-3.7.7.tgz#0d2baf888b37aac1cd8d8cb484b0826fa7b82a26"
+  integrity sha512-wN0NXLDymC9PgT3I6jMx/YLjcEtegAnFg7VaavzLfc1vFegD4lKlrvRmc0qV2IIiRMZLShEsS0QtYtAyhi/qew==
   dependencies:
     shelljs "^0.8.4"
 
@@ -2945,20 +2945,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001214:
-  version "1.0.30001219"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b"
-  integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==
-
-caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280:
-  version "1.0.30001286"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz#3e9debad420419618cfdf52dc9b6572b28a8fff6"
-  integrity sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==
-
-caniuse-lite@^1.0.30001219:
-  version "1.0.30001220"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001220.tgz#c080e1c8eefb99f6cc9685da6313840bdbaf4c36"
-  integrity sha512-pjC2T4DIDyGAKTL4dMvGUQaMUHRmhvPpAgNNTa14jaBWHu+bLQgvpFqElxh9L4829Fdx0PlKiMp3wnYldRtECA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001214, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280:
+  version "1.0.30001303"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001303.tgz"
+  integrity sha512-/Mqc1oESndUNszJP0kx0UaQU9kEv9nNtJ7Kn8AdA0mNnH8eR1cj0kG+NbNuC1Wq/b21eA8prhKRA3bbkjONegQ==
 
 ccount@^1.0.0, ccount@^1.0.3:
   version "1.1.0"
@@ -4499,9 +4489,9 @@ flux@^4.0.1:
     fbjs "^3.0.0"
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
-  integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -4655,19 +4645,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.0, glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.3:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.3:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -5348,6 +5326,13 @@ is-core-module@^2.2.0:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.8.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -6284,9 +6269,9 @@ nan@^2.12.1:
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
 nanoid@^3.1.28, nanoid@^3.1.30:
-  version "3.1.30"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
-  integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6737,7 +6722,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-parse@^1.0.6:
+path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -7885,7 +7870,16 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.14.2, resolve@^1.3.2:
+resolve@^1.1.6:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
+  integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
+  dependencies:
+    is-core-module "^2.8.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.14.2, resolve@^1.3.2:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -8218,9 +8212,9 @@ shell-quote@1.7.2:
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
 shelljs@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
+  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -8606,6 +8600,11 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 svg-parser@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5"
diff --git a/OpenRefine/extensions/database/pom.xml b/OpenRefine/extensions/database/pom.xml
index fe1ca7919..47984c6d2 100644
--- a/OpenRefine/extensions/database/pom.xml
+++ b/OpenRefine/extensions/database/pom.xml
@@ -84,12 +84,12 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
-      <version>1.40.1</version>
+      <version>1.41.2</version>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>8.0.27</version>
+      <version>8.0.28</version>
     </dependency>
     <dependency>
       <groupId>org.jasypt</groupId>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>
-      <version>2.7.4</version>
+      <version>2.7.5</version>
     </dependency>
     <dependency>
       <groupId>org.xerial</groupId>
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
index 524dad560..d91ed4f08 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTestUtils.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database;
 
 import java.io.File;
@@ -18,92 +19,92 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DBExtensionTestUtils {
-    
+
     private static final Logger logger = LoggerFactory.getLogger("DBExtensionTestUtils");
-    
+
     private static final String MYSQL_DB_NAME = "mysql";
     private static final String DEFAULT_MYSQL_HOST = "127.0.0.1";
-    private static final int    DEFAULT_MYSQL_PORT = 3306;
+    private static final int DEFAULT_MYSQL_PORT = 3306;
     private static final String DEFAULT_MYSQL_USER = "root";
     private static final String DEFAULT_MYSQL_PASSWORD = "secret";
     private static final String DEFAULT_MYSQL_DB_NAME = "testdb";
-    
+
     private static final String PGSQL_DB_NAME = "postgresql";
     private static final String DEFAULT_PGSQL_HOST = "127.0.0.1";
-    private static final int    DEFAULT_PGSQL_PORT = 5432;
+    private static final int DEFAULT_PGSQL_PORT = 5432;
     private static final String DEFAULT_PGSQL_USER = "postgres";
     private static final String DEFAULT_PGSQL_PASSWORD = "";
     private static final String DEFAULT_PGSQL_DB_NAME = "openrefine";
-    
+
     private static final String DEFAULT_TEST_TABLE = "test_data";
-    
+
     private static final int SAMPLE_SIZE = 500000;
     private static final int BATCH_SIZE = 1000;
-    
+
     private static Random rand = new Random();
-    
-    private  Map<Integer, Integer> mncMap;
-    private  Map<Integer, Integer> mccMap;
-    
-  
+
+    private Map<Integer, Integer> mncMap;
+    private Map<Integer, Integer> mccMap;
+
     /**
      * Create Test Table with one row of Data
-     * @param dbConfig DatabaseConfiguration to test
+     * 
+     * @param dbConfig
+     *            DatabaseConfiguration to test
      * @param tableName
-     * @throws DatabaseServiceException 
-     * @throws SQLException 
+     * @throws DatabaseServiceException
+     * @throws SQLException
      */
     public static void initTestData(DatabaseConfiguration dbConfig, String tableName)
             throws DatabaseServiceException, SQLException {
-        
+
         Statement stmt = null;
-        Connection conn  = null;
+        Connection conn = null;
         try {
             DatabaseService dbService = DatabaseService.get(dbConfig.getDatabaseType());
             conn = dbService.getConnection(dbConfig);
             stmt = conn.createStatement();
-            
-             DatabaseMetaData dbm = conn.getMetaData();
-             // check if "employee" table is there
-             ResultSet tables = dbm.getTables(null, null, tableName, null);
-             boolean dropTable = false;
-             if (tables.next()) {
-                 dropTable = true;
-                 //System.out.println("Drop Table Result::" + dropResult);
-             }
-             tables.close();
-             if (dropTable) {
-                 stmt.executeUpdate("DROP TABLE " + tableName);
-             }
-          
+
+            DatabaseMetaData dbm = conn.getMetaData();
+            // check if "employee" table is there
+            ResultSet tables = dbm.getTables(null, null, tableName, null);
+            boolean dropTable = false;
+            if (tables.next()) {
+                dropTable = true;
+                // System.out.println("Drop Table Result::" + dropResult);
+            }
+            tables.close();
+            if (dropTable) {
+                stmt.executeUpdate("DROP TABLE " + tableName);
+            }
+
             String createSQL = " CREATE TABLE " + tableName + " ( "
                     + " ID   INT  NOT NULL, "
                     + " NAME VARCHAR (20) NOT NULL, "
                     + " CITY  VARCHAR (20) NOT NULL,"
                     + " PRIMARY KEY (ID)  );";
-     
-                
+
             stmt.executeUpdate(createSQL);
-            //System.out.println("Create Table Result::" + createResult);
-            
+            // System.out.println("Create Table Result::" + createResult);
+
             String insertTableSQL = "INSERT INTO " + tableName
                     + "(ID, NAME, CITY) " + "VALUES"
                     + "(1,'frank lens','Dallas')";
-            
+
             stmt.executeUpdate(insertTableSQL);
-           // System.out.println("Insert Data Result::" + insertResult);
-            
+            // System.out.println("Insert Data Result::" + insertResult);
+
             logger.info("Database Test Init Data Created!!!");
-            
+
         } finally {
-            if(stmt != null) {
+            if (stmt != null) {
                 try {
                     stmt.close();
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
             }
-            if(conn != null) {
+            if (conn != null) {
                 try {
                     conn.close();
                 } catch (SQLException e) {
@@ -111,55 +112,53 @@ public class DBExtensionTestUtils {
                 }
             }
         }
-        
+
     }
-    
-    
+
     public static void initTestData(DatabaseConfiguration dbConfig)
             throws DatabaseServiceException, SQLException {
-         
+
         Statement stmt = null;
-        Connection conn  = null;
+        Connection conn = null;
         try {
             DatabaseService dbService = DatabaseService.get(dbConfig.getDatabaseType());
             conn = dbService.getConnection(dbConfig);
             stmt = conn.createStatement();
-            
-             DatabaseMetaData dbm = conn.getMetaData();
-             // check if "employee" table is there
-             ResultSet tables = dbm.getTables(null, null, DEFAULT_TEST_TABLE, null);
-             boolean dropTable = false;
-             if (tables.next()) {
+
+            DatabaseMetaData dbm = conn.getMetaData();
+            // check if "employee" table is there
+            ResultSet tables = dbm.getTables(null, null, DEFAULT_TEST_TABLE, null);
+            boolean dropTable = false;
+            if (tables.next()) {
                 dropTable = true;
-                //System.out.println("Drop Table Result::" + dropResult);
-             }
-             tables.close();
-             if (dropTable) {
-                 stmt.executeUpdate("DROP TABLE " + DEFAULT_TEST_TABLE);
-                 //System.out.println("Drop Table Result::" + dropResult);
-             }
-          
-            String createSQL = " CREATE TABLE TEST_DATA( " 
+                // System.out.println("Drop Table Result::" + dropResult);
+            }
+            tables.close();
+            if (dropTable) {
+                stmt.executeUpdate("DROP TABLE " + DEFAULT_TEST_TABLE);
+                // System.out.println("Drop Table Result::" + dropResult);
+            }
+
+            String createSQL = " CREATE TABLE TEST_DATA( "
                     + " ID   INT  NOT NULL, "
                     + " NAME VARCHAR (20) NOT NULL, "
                     + " CITY  VARCHAR (20) NOT NULL,"
                     + " PRIMARY KEY (ID)  );";
-     
-                
+
             stmt.executeUpdate(createSQL);
-            //System.out.println("Create Table Result::" + createResult);
-            
+            // System.out.println("Create Table Result::" + createResult);
+
             String insertTableSQL = "INSERT INTO TEST_DATA"
                     + "(ID, NAME, CITY) " + "VALUES"
                     + "(1,'frank lens','Dallas')";
-            
+
             stmt.executeUpdate(insertTableSQL);
-           // System.out.println("Insert Data Result::" + insertResult);
-            
+            // System.out.println("Insert Data Result::" + insertResult);
+
             logger.info("Database Test Init Data Created!!!");
 
         } finally {
-            if(stmt != null) {
+            if (stmt != null) {
                 try {
                     stmt.close();
                 } catch (SQLException e) {
@@ -167,7 +166,7 @@ public class DBExtensionTestUtils {
                     e.printStackTrace();
                 }
             }
-            if(conn != null) {
+            if (conn != null) {
                 try {
                     conn.close();
                 } catch (SQLException e) {
@@ -176,31 +175,31 @@ public class DBExtensionTestUtils {
                 }
             }
         }
-        
+
     }
-    
-   /**
-    * CREATE test data in MySQL 
-    * Table name: test_data
-    * @param sampleSize
-    * @param batchSize
-    * @throws DatabaseServiceException 
-    * @throws SQLException 
-    */
+
+    /**
+     * CREATE test data in MySQL Table name: test_data
+     * 
+     * @param sampleSize
+     * @param batchSize
+     * @throws DatabaseServiceException
+     * @throws SQLException
+     */
     public void generateMySQLTestData(int sampleSize, int batchSize)
             throws DatabaseServiceException, SQLException {
-        mncMap =  new HashMap<Integer, Integer>();
-        mccMap =  new HashMap<Integer, Integer>();
+        mncMap = new HashMap<Integer, Integer>();
+        mccMap = new HashMap<Integer, Integer>();
         mccMap.put(0, 302);
         mccMap.put(1, 311);
         mccMap.put(2, 730);
         mccMap.put(1, 622);
-        
+
         mncMap.put(0, 006);
         mncMap.put(1, 140);
         mncMap.put(2, 380);
         mncMap.put(3, 710);
-        
+
         DatabaseConfiguration dc = new DatabaseConfiguration();
         dc.setDatabaseHost(DEFAULT_MYSQL_HOST);
         dc.setDatabaseName(DEFAULT_MYSQL_DB_NAME);
@@ -209,75 +208,74 @@ public class DBExtensionTestUtils {
         dc.setDatabaseType(MYSQL_DB_NAME);
         dc.setDatabaseUser(DEFAULT_MYSQL_USER);
         dc.setUseSSL(false);
-        
+
         String truncateTableSQL = "TRUNCATE test_data";
-       
+
         String insertTableSQL = "INSERT INTO test_data("
                 + "id, ue_id, start_time, end_date, bytes_upload, bytes_download, cell_id, mcc, mnc, lac, imei)"
                 + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
-        
+
         Connection conn = DatabaseService.get(MYSQL_DB_NAME).getConnection(dc);
-            
+
         Statement truncateStmt = conn.createStatement();
         int result = truncateStmt.executeUpdate(truncateTableSQL);
         System.out.println("Truncate Table Result::" + result);
         truncateStmt.close();
-        
-        
+
         conn.setAutoCommit(false);
-        
+
         PreparedStatement stmt = conn.prepareStatement(insertTableSQL);
-       
-        int counter=1;
+
+        int counter = 1;
         for (int i = 0; i < sampleSize; i++) {
-           stmt.setLong(1, i);
-           stmt.setString(2,  getNextUeId());
-           stmt.setDate(3, getNextStartDate());
-           stmt.setDate(4, getNextEndDate());
-           stmt.setInt(5, rand.nextInt());
-           stmt.setInt(6, rand.nextInt());
-           stmt.setInt(7, rand.nextInt(10));
-           stmt.setInt(8, getMCC());
-           stmt.setInt(9, getMNC());
-           stmt.setInt(10, rand.nextInt(100));
-           stmt.setString(11, getNextIMEI());
-         
-           stmt.addBatch();
-           
-           //Execute batch of 1000 records
-           if(i%batchSize==0){
-              stmt.executeBatch();
-              conn.commit();
-              System.out.println("Batch "+(counter++)+" executed successfully");
-           }
+            stmt.setLong(1, i);
+            stmt.setString(2, getNextUeId());
+            stmt.setDate(3, getNextStartDate());
+            stmt.setDate(4, getNextEndDate());
+            stmt.setInt(5, rand.nextInt());
+            stmt.setInt(6, rand.nextInt());
+            stmt.setInt(7, rand.nextInt(10));
+            stmt.setInt(8, getMCC());
+            stmt.setInt(9, getMNC());
+            stmt.setInt(10, rand.nextInt(100));
+            stmt.setString(11, getNextIMEI());
+
+            stmt.addBatch();
+
+            // Execute batch of 1000 records
+            if (i % batchSize == 0) {
+                stmt.executeBatch();
+                conn.commit();
+                System.out.println("Batch " + (counter++) + " executed successfully");
+            }
         }
-        //execute final batch
+        // execute final batch
         stmt.executeBatch();
-        System.out.println("Final Batch Executed "+(counter++)+" executed successfully");
+        System.out.println("Final Batch Executed " + (counter++) + " executed successfully");
         conn.commit();
         conn.close();
     }
-   
+
     /**
      * 
      * @param sampleSize
      * @param batchSize
-     * @throws DatabaseServiceException 
-     * @throws SQLException 
+     * @throws DatabaseServiceException
+     * @throws SQLException
      */
     public void generatePgSQLTestData(int sampleSize, int batchSize) throws DatabaseServiceException, SQLException {
-        mncMap =  new HashMap<Integer, Integer>();
-        mccMap =  new HashMap<Integer, Integer>();
+        mncMap = new HashMap<Integer, Integer>();
+        mccMap = new HashMap<Integer, Integer>();
         mccMap.put(0, 302);
         mccMap.put(1, 311);
         mccMap.put(2, 730);
         mccMap.put(1, 622);
-        
+
         mncMap.put(0, 006);
         mncMap.put(1, 140);
         mncMap.put(2, 380);
         mncMap.put(3, 710);
-        
+
         DatabaseConfiguration dc = new DatabaseConfiguration();
         dc.setDatabaseHost(DEFAULT_PGSQL_HOST);
         dc.setDatabaseName(DEFAULT_PGSQL_DB_NAME);
@@ -286,115 +284,111 @@ public class DBExtensionTestUtils {
         dc.setDatabaseType(PGSQL_DB_NAME);
         dc.setDatabaseUser(DEFAULT_PGSQL_USER);
         dc.setUseSSL(false);
-        
+
         String truncateTableSQL = "TRUNCATE public.test_data";
-       
+
         String insertTableSQL = "INSERT INTO public.test_data("
                 + "id, ue_id, start_time, end_date, bytes_upload, bytes_download, cell_id, mcc, mnc, lac, imei)"
                 + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);";
-        
+
         Connection conn = DatabaseService.get(PGSQL_DB_NAME).getConnection(dc);
-            
+
         Statement truncateStmt = conn.createStatement();
         int result = truncateStmt.executeUpdate(truncateTableSQL);
         System.out.println("Truncate Table Result::" + result);
         truncateStmt.close();
-        
-        
+
         conn.setAutoCommit(false);
-        
+
         PreparedStatement stmt = conn.prepareStatement(insertTableSQL);
-       
-        int counter=1;
+
+        int counter = 1;
         for (int i = 0; i < sampleSize; i++) {
-           stmt.setLong(1, i);
-           stmt.setString(2,  getNextUeId());
-           stmt.setDate(3, getNextStartDate());
-           stmt.setDate(4, getNextEndDate());
-           stmt.setInt(5, rand.nextInt());
-           stmt.setInt(6, rand.nextInt());
-           stmt.setInt(7, rand.nextInt(10));
-           stmt.setInt(8, getMCC());
-           stmt.setInt(9, getMNC());
-           stmt.setInt(10, rand.nextInt(100));
-           stmt.setString(11, getNextIMEI());
-         
-           stmt.addBatch();
-           
-           //Execute batch of 1000 records
-           if(i%batchSize==0){
-              stmt.executeBatch();
-              conn.commit();
-              System.out.println("Batch "+(counter++)+" executed successfully");
-           }
+            stmt.setLong(1, i);
+            stmt.setString(2, getNextUeId());
+            stmt.setDate(3, getNextStartDate());
+            stmt.setDate(4, getNextEndDate());
+            stmt.setInt(5, rand.nextInt());
+            stmt.setInt(6, rand.nextInt());
+            stmt.setInt(7, rand.nextInt(10));
+            stmt.setInt(8, getMCC());
+            stmt.setInt(9, getMNC());
+            stmt.setInt(10, rand.nextInt(100));
+            stmt.setString(11, getNextIMEI());
+
+            stmt.addBatch();
+
+            // Execute batch of 1000 records
+            if (i % batchSize == 0) {
+                stmt.executeBatch();
+                conn.commit();
+                System.out.println("Batch " + (counter++) + " executed successfully");
+            }
         }
-        //execute final batch
+        // execute final batch
         stmt.executeBatch();
-        System.out.println("Final Batch Executed "+(counter++)+" executed successfully");
+        System.out.println("Final Batch Executed " + (counter++) + " executed successfully");
         conn.commit();
         conn.close();
- 
+
     }
 
     private String getNextIMEI() {
-      int n = 1000000000 + rand.nextInt(900000000);
+        int n = 1000000000 + rand.nextInt(900000000);
         return "" + n;
     }
 
-  
+    private int getMNC() {
 
-    private  int getMNC() {
- 
         return mncMap.get(rand.nextInt(3));
     }
 
-    private  int getMCC() {
- 
+    private int getMCC() {
+
         return mccMap.get(rand.nextInt(3));
     }
 
     private Date getNextEndDate() {
-    
-        return  new Date(System.currentTimeMillis() + 1);
+
+        return new Date(System.currentTimeMillis() + 1);
     }
 
     private Date getNextStartDate() {
-   
+
         return new Date(System.currentTimeMillis());
     }
 
     private String getNextUeId() {
-     
+
         int n = 300000000 + rand.nextInt(900000000);
-        
+
         return "" + n;
     }
-    
+
     public static void main(String[] args) throws DatabaseServiceException, SQLException {
         DBExtensionTestUtils testUtil = new DBExtensionTestUtils();
         testUtil.generatePgSQLTestData(SAMPLE_SIZE, BATCH_SIZE);
-       // testUtil.generateMySQLTestData();
+        // testUtil.generateMySQLTestData();
     }
 
-
     public static void cleanUpTestData(DatabaseConfiguration dbConfig) {
         Statement stmt = null;
-        Connection conn  = null;
+        Connection conn = null;
         try {
             DatabaseService dbService = DatabaseService.get(dbConfig.getDatabaseType());
             conn = dbService.getConnection(dbConfig);
             stmt = conn.createStatement();
-            
-             DatabaseMetaData dbm = conn.getMetaData();
-             // check if "employee" table is there
-             ResultSet tables = dbm.getTables(null, null, DEFAULT_TEST_TABLE, null);
-             if (tables.next()) {
-                 stmt.executeUpdate("DROP TABLE " + DEFAULT_TEST_TABLE);
-                 //System.out.println("Drop Table Result::" + dropResult);
-             }
-             
-             logger.info("Database Test Cleanup Done");
-          
+
+            DatabaseMetaData dbm = conn.getMetaData();
+            // check if "employee" table is there
+            ResultSet tables = dbm.getTables(null, null, DEFAULT_TEST_TABLE, null);
+            if (tables.next()) {
+                stmt.executeUpdate("DROP TABLE " + DEFAULT_TEST_TABLE);
+                // System.out.println("Drop Table Result::" + dropResult);
+            }
+
+            logger.info("Database Test Cleanup Done");
+
         } catch (DatabaseServiceException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -402,7 +396,7 @@ public class DBExtensionTestUtils {
             // TODO Auto-generated catch block
             e.printStackTrace();
         } finally {
-            if(stmt != null) {
+            if (stmt != null) {
                 try {
                     stmt.close();
                 } catch (SQLException e) {
@@ -410,7 +404,7 @@ public class DBExtensionTestUtils {
                     e.printStackTrace();
                 }
             }
-            if(conn != null) {
+            if (conn != null) {
                 try {
                     conn.close();
                 } catch (SQLException e) {
@@ -419,9 +413,9 @@ public class DBExtensionTestUtils {
                 }
             }
         }
-        
+
     }
-    
+
     public static File createTempDirectory(String name)
             throws IOException {
         File dir = File.createTempFile(name, "");
@@ -429,7 +423,7 @@ public class DBExtensionTestUtils {
         dir.mkdir();
         return dir;
     }
-    
+
     public static String getJDBCUrl(DatabaseConfiguration dbConfig) {
         Map<String, Object> substitutes = new HashMap<String, Object>();
         substitutes.put("dbType", dbConfig.getDatabaseType());
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java
index 167611558..bd1d0bc11 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DBExtensionTests.java
@@ -38,22 +38,21 @@ import java.util.Properties;
 import org.slf4j.Logger;
 
 public class DBExtensionTests {
-    
+
     protected final String MYSQL_DB_NAME = "mysql";
     protected final String DEFAULT_MYSQL_HOST = "127.0.0.1";
     protected final String DEFAULT_MYSQL_PORT = "3306";
     protected final String DEFAULT_MYSQL_USER = "root";
     protected final String DEFAULT_MYSQL_PASSWORD = "secret";
     protected final String DEFAULT_MYSQL_DB_NAME = "testdb";
-    
+
     protected final String PGSQL_DB_NAME = "postgresql";
     protected final String DEFAULT_PGSQL_HOST = "127.0.0.1";
     protected final String DEFAULT_PGSQL_PORT = "5432";
     protected final String DEFAULT_PGSQL_USER = "postgres";
     protected final String DEFAULT_PGSQL_PASSWORD = "";
     protected final String DEFAULT_PGSQL_DB_NAME = "testdb";
-    
-    
+
     protected final String MARIA_DB_NAME = "mariadb";
     protected final String DEFAULT_MARIADB_HOST = "127.0.0.1";
     protected final String DEFAULT_MARIADB_PORT = "3306";
@@ -63,11 +62,11 @@ public class DBExtensionTests {
 
     protected final String SQLITE_DB_NAME = "sqlite";
     protected final String DEFAULT_SQLITE_DB_NAME = "extension_test_db.sqlite";
-    
+
     protected final String DEFAULT_TEST_TABLE = "test_data";
-    
+
     protected Properties properties;
 
-    protected Logger logger;  
-   
+    protected Logger logger;
+
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java
index 0065e46d6..561994872 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseImportControllerTest.java
@@ -1,5 +1,5 @@
-package com.google.refine.extension.database;
 
+package com.google.refine.extension.database;
 
 import static org.mockito.Mockito.when;
 
@@ -34,50 +34,48 @@ import com.google.refine.io.FileProjectManager;
 import com.google.refine.model.Project;
 import com.google.refine.util.ParsingUtilities;
 
-
-
 @Test(groups = { "requiresMySQL" })
-public class DatabaseImportControllerTest extends DBExtensionTests{
+public class DatabaseImportControllerTest extends DBExtensionTests {
 
     @Mock
     private HttpServletRequest request;
 
     @Mock
     private HttpServletResponse response;
-    
+
     private Project project;
     private ProjectMetadata metadata;
     private ImportingJob job;
     private RefineServlet servlet;
 
     private String JSON_OPTION = "{\"mode\":\"row-based\"}}";
- 
+
     private DatabaseConfiguration testDbConfig;
-  
+
     private String query;
-   
-    //System under test
+
+    // System under test
     private DatabaseImportController SUT = null;
 
     @BeforeMethod
     public void setUp() throws IOException {
         MockitoAnnotations.initMocks(this);
-        
+
         File dir = DBExtensionTestUtils.createTempDirectory("OR_DBExtension_Test_WorkspaceDir");
         FileProjectManager.initialize(dir);
-        
+
         servlet = new RefineDbServletStub();
         ImportingManager.initialize(servlet);
         project = new Project();
         metadata = new ProjectMetadata();
         job = ImportingManager.createJob();
-     
+
         metadata.setName("Database Import Test Project");
         ProjectManager.singleton.registerProject(project, metadata);
         SUT = new DatabaseImportController();
-      
+
     }
-    
+
     @AfterMethod
     public void tearDown() {
         SUT = null;
@@ -87,9 +85,8 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
         metadata = null;
         ImportingManager.disposeJob(job.id);
         job = null;
-        //options = null;
+        // options = null;
     }
-    
 
     @Test
     public void testDoGet() {
@@ -98,11 +95,11 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
 
         try {
             when(response.getWriter()).thenReturn(pw);
-           
+
             SUT.doGet(request, response);
-            
+
             String result = sw.getBuffer().toString().trim();
-            ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);      
+            ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
             String code = json.get("status").asText();
             String message = json.get("message").asText();
             Assert.assertNotNull(code);
@@ -110,24 +107,23 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
             Assert.assertEquals(code, "error");
             Assert.assertEquals(message, "GET not implemented");
 
-        
         } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
-    
+
     @Test
     public void testDoPostInvalidSubCommand() throws IOException, ServletException {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         when(request.getQueryString()).thenReturn(
                 "http://127.0.0.1:3333/command/core/importing-controller?controller=database/database-import-controller&subCommand=invalid-sub-command");
-        
+
         when(response.getWriter()).thenReturn(pw);
-       //test
+        // test
         SUT.doPost(request, response);
-   
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
 
@@ -138,43 +134,40 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
         Assert.assertEquals(code, "error");
         Assert.assertEquals(message, "No such sub command");
     }
-        
-    
 
     @Test
     public void testDoPostInitializeParser() throws ServletException, IOException {
-        
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(request.getQueryString()).thenReturn(
                 "http://127.0.0.1:3333/command/core/importing-controller?controller=database/database-import-controller&subCommand=initialize-parser-ui");
         when(response.getWriter()).thenReturn(pw);
-     
+
         SUT.doPost(request, response);
-       
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String status = json.get("status").asText();
-        //System.out.println("json::" + json);
+        // System.out.println("json::" + json);
         Assert.assertEquals(status, "ok");
     }
-    
+
     @Test
     public void testDoPostParsePreview() throws IOException, ServletException {
-        
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-            
+
         long jobId = job.id;
-        
+
         when(request.getQueryString()).thenReturn(
                 "http://127.0.0.1:3333/command/core/importing-controller?controller=database%2Fdatabase-import-controller&jobID="
                         + jobId + "&subCommand=parse-preview");
         when(response.getWriter()).thenReturn(pw);
-        
-        
+
         when(request.getParameter("databaseType")).thenReturn(testDbConfig.getDatabaseType());
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
         when(request.getParameter("databasePort")).thenReturn("" + testDbConfig.getDatabasePort());
@@ -183,31 +176,30 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("query")).thenReturn(query);
         when(request.getParameter("options")).thenReturn(JSON_OPTION);
-   
+
         SUT.doPost(request, response);
-       
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String status = json.get("status").asText();
-        //System.out.println("json::" + json);
+        // System.out.println("json::" + json);
         Assert.assertEquals(status, "ok");
     }
-    
+
     @Test
     public void testDoPostCreateProject() throws IOException, ServletException {
-        
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-            
+
         long jobId = job.id;
-        
+
         when(request.getQueryString()).thenReturn(
                 "http://127.0.0.1:3333/command/core/importing-controller?controller=database%2Fdatabase-import-controller&jobID="
                         + jobId + "&subCommand=create-project");
         when(response.getWriter()).thenReturn(pw);
-        
-        
+
         when(request.getParameter("databaseType")).thenReturn(testDbConfig.getDatabaseType());
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
         when(request.getParameter("databasePort")).thenReturn("" + testDbConfig.getDatabasePort());
@@ -216,27 +208,26 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("query")).thenReturn(query);
         when(request.getParameter("options")).thenReturn(JSON_OPTION);
-        
-       
+
         SUT.doPost(request, response);
-       
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String status = json.get("status").asText();
-        //System.out.println("json::" + json);
+        // System.out.println("json::" + json);
         Assert.assertEquals(status, "ok");
     }
-    
+
     @BeforeTest
-    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
     public void beforeTest(
-           @Optional(DEFAULT_MYSQL_DB_NAME)   String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-           @Optional(DEFAULT_MYSQL_PORT)      String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-           @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-       
+            @Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
         MockitoAnnotations.initMocks(this);
-       
+
         testDbConfig = new DatabaseConfiguration();
         testDbConfig.setDatabaseHost(mySqlDbHost);
         testDbConfig.setDatabaseName(mySqlDbName);
@@ -246,13 +237,11 @@ public class DatabaseImportControllerTest extends DBExtensionTests{
         testDbConfig.setDatabaseUser(mySqlDbUser);
         testDbConfig.setUseSSL(false);
         query = "SELECT count(*) FROM " + mySqlTestTable;
-        
-        //testTable = mySqlTestTable;
-        
-        
+
+        // testTable = mySqlTestTable;
+
         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-        
+
     }
-  
-    
+
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java
index b85a7cfd0..c43cf7a51 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/DatabaseServiceTest.java
@@ -1,5 +1,5 @@
-package com.google.refine.extension.database;
 
+package com.google.refine.extension.database;
 
 import java.sql.Connection;
 import java.util.List;
@@ -18,22 +18,17 @@ import com.google.refine.extension.database.model.DatabaseRow;
 import com.google.refine.extension.database.mysql.MySQLDatabaseService;
 import com.google.refine.extension.database.pgsql.PgSQLDatabaseService;
 
+public class DatabaseServiceTest extends DBExtensionTests {
 
-
-
-public class DatabaseServiceTest extends DBExtensionTests{
-    
     private DatabaseConfiguration testDbConfig;
     private String testTable;
-    
-  
+
     @BeforeTest
-    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-           @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-           @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-       
- 
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
         testDbConfig = new DatabaseConfiguration();
         testDbConfig.setDatabaseHost(mySqlDbHost);
         testDbConfig.setDatabaseName(mySqlDbName);
@@ -42,18 +37,16 @@ public class DatabaseServiceTest extends DBExtensionTests{
         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(mySqlDbUser);
         testDbConfig.setUseSSL(false);
-        
+
         testTable = mySqlTestTable;
-       // DBExtensionTestUtils.initTestData(testDbConfig);
-        
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(MariaDBDatabaseService.DB_NAME, MariaDBDatabaseService.getInstance());
         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
         DatabaseService.DBType.registerDatabase(PgSQLDatabaseService.DB_NAME, PgSQLDatabaseService.getInstance());
-        
+
     }
 
-
-
     @Test
     public void testGetDatabaseUrl() {
         DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
@@ -61,32 +54,31 @@ public class DatabaseServiceTest extends DBExtensionTests{
         Assert.assertNotNull(dbUrl);
         Assert.assertEquals(dbUrl, DBExtensionTestUtils.getJDBCUrl(testDbConfig));
     }
-  
-    
-    @Test(groups = {"requiresPgSQL"})
+
+    @Test(groups = { "requiresPgSQL" })
     public void testGetPgSQLDBService() {
         DatabaseService dbService = DatabaseService.get(PgSQLDatabaseService.DB_NAME);
-        Assert.assertNotNull(dbService);  
+        Assert.assertNotNull(dbService);
         Assert.assertEquals(dbService.getClass(), PgSQLDatabaseService.class);
     }
-    
-    @Test(groups = {"requiresMySQL"})
+
+    @Test(groups = { "requiresMySQL" })
     public void testGetMySQLDBService() {
-       
+
         DatabaseService dbService = DatabaseService.get(MySQLDatabaseService.DB_NAME);
-        Assert.assertNotNull(dbService);  
+        Assert.assertNotNull(dbService);
         Assert.assertEquals(dbService.getClass(), MySQLDatabaseService.class);
     }
-    
-    @Test(groups = {"requiresMariaDB"})
+
+    @Test(groups = { "requiresMariaDB" })
     public void testGetMariaDBSQLDBService() {
-       
+
         DatabaseService dbService = DatabaseService.get(MariaDBDatabaseService.DB_NAME);
-        Assert.assertNotNull(dbService);  
+        Assert.assertNotNull(dbService);
         Assert.assertEquals(dbService.getClass(), MariaDBDatabaseService.class);
     }
 
-    @Test(groups = {"requiresSQLite"})
+    @Test(groups = { "requiresSQLite" })
     public void testGetSQLiteDBService() {
 
         DatabaseService dbService = DatabaseService.get(SQLiteDatabaseService.DB_NAME);
@@ -94,28 +86,28 @@ public class DatabaseServiceTest extends DBExtensionTests{
         Assert.assertEquals(dbService.getClass(), SQLiteDatabaseService.class);
     }
 
-    @Test(groups = {"requiresMySQL"})
+    @Test(groups = { "requiresMySQL" })
     public void testGetConnection() throws DatabaseServiceException {
-       DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
-       Connection conn = dbService.getConnection(testDbConfig);
-       Assert.assertNotNull(conn);
+        DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
+        Connection conn = dbService.getConnection(testDbConfig);
+        Assert.assertNotNull(conn);
     }
 
-    @Test(groups = {"requiresMySQL"})
+    @Test(groups = { "requiresMySQL" })
     public void testTestConnection() throws DatabaseServiceException {
         DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
         boolean result = dbService.testConnection(testDbConfig);
         Assert.assertEquals(result, true);
     }
 
-    @Test(groups = {"requiresMySQL"})
+    @Test(groups = { "requiresMySQL" })
     public void testConnect() throws DatabaseServiceException {
         DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
         DatabaseInfo databaseInfo = dbService.connect(testDbConfig);
         Assert.assertNotNull(databaseInfo);
     }
 
-    @Test(groups = {"requiresMySQL"})
+    @Test(groups = { "requiresMySQL" })
     public void testExecuteQuery() throws DatabaseServiceException {
         DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
         DatabaseInfo databaseInfo = dbService.testQuery(testDbConfig,
@@ -132,24 +124,24 @@ public class DatabaseServiceTest extends DBExtensionTests{
         Assert.assertEquals(limitQuery, "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
     }
 
-    @Test(groups = {"requiresMySQL"})
+    @Test(groups = { "requiresMySQL" })
     public void testGetColumns() throws DatabaseServiceException {
         List<DatabaseColumn> dbColumns;
-      
+
         DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
-        dbColumns = dbService.getColumns(testDbConfig,"SELECT * FROM " + testTable);
+        dbColumns = dbService.getColumns(testDbConfig, "SELECT * FROM " + testTable);
         Assert.assertNotNull(dbColumns);
-        
+
         int cols = dbColumns.size();
         Assert.assertEquals(cols, 10);
     }
 
-    @Test(groups = {"requiresMySQL"})
+    @Test(groups = { "requiresMySQL" })
     public void testGetRows() throws DatabaseServiceException {
         DatabaseService dbService = DatabaseService.get(testDbConfig.getDatabaseType());
         List<DatabaseRow> dbRows = dbService.getRows(testDbConfig,
                 "SELECT * FROM " + testTable);
-        
+
         Assert.assertNotNull(dbRows);
         Assert.assertEquals(dbRows.size(), 1);
     }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMariaDBTestDatabase.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMariaDBTestDatabase.java
index f26132520..9a25dc399 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMariaDBTestDatabase.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMariaDBTestDatabase.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database;
 
 import java.sql.SQLException;
@@ -18,10 +19,10 @@ public class InitMariaDBTestDatabase extends DBExtensionTests {
     @BeforeSuite
     @Parameters({ "mariadbDbName", "mariadbDbHost", "mariadbDbPort", "mariadbDbUser", "mariadbDbPassword", "mariadbTestTable" })
     public void beforeSuite(
-            @Optional(DEFAULT_MARIADB_NAME)      String mariadbDbName,     @Optional(DEFAULT_MARIADB_HOST)  String mariadbDbHost, 
-            @Optional(DEFAULT_MARIADB_PORT)      String mariadbDbPort,     @Optional(DEFAULT_MARIADB_USER)  String mariadbDbUser,
-            @Optional(DEFAULT_MARIADB_PASSWORD)  String mariadbDbPassword, @Optional(DEFAULT_TEST_TABLE)    String mariadbTestTable)
-                    throws DatabaseServiceException, SQLException {
+            @Optional(DEFAULT_MARIADB_NAME) String mariadbDbName, @Optional(DEFAULT_MARIADB_HOST) String mariadbDbHost,
+            @Optional(DEFAULT_MARIADB_PORT) String mariadbDbPort, @Optional(DEFAULT_MARIADB_USER) String mariadbDbUser,
+            @Optional(DEFAULT_MARIADB_PASSWORD) String mariadbDbPassword, @Optional(DEFAULT_TEST_TABLE) String mariadbTestTable)
+            throws DatabaseServiceException, SQLException {
 
         mariadbDbConfig = new DatabaseConfiguration();
         mariadbDbConfig.setDatabaseHost(mariadbDbHost);
@@ -34,7 +35,7 @@ public class InitMariaDBTestDatabase extends DBExtensionTests {
 
         DBExtensionTestUtils.initTestData(mariadbDbConfig);
     }
-  
+
     @AfterSuite
     public void afterSuite() {
         DBExtensionTestUtils.cleanUpTestData(mariadbDbConfig);
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMySQLTestDatabase.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMySQLTestDatabase.java
index b77fb98a4..3125fa30b 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMySQLTestDatabase.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitMySQLTestDatabase.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database;
 
 import java.sql.SQLException;
@@ -12,19 +13,19 @@ import com.google.refine.extension.database.mysql.MySQLDatabaseService;
 
 @Test(groups = { "requiresMySQL" })
 public class InitMySQLTestDatabase extends DBExtensionTests {
- 
+
     private DatabaseConfiguration mysqlDbConfig;
 
     @BeforeSuite
     @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
     public void beforeSuite(
-            @Optional(DEFAULT_MYSQL_DB_NAME)   String mySqlDbName,     @Optional(DEFAULT_MYSQL_HOST)  String mySqlDbHost, 
-            @Optional(DEFAULT_MYSQL_PORT)      String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER)  String mySqlDbUser,
-            @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable)
-                    throws DatabaseServiceException, SQLException {
-        
-        //System.out.println("@BeforeSuite\n");
-         mysqlDbConfig = new DatabaseConfiguration();
+            @Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable)
+            throws DatabaseServiceException, SQLException {
+
+        // System.out.println("@BeforeSuite\n");
+        mysqlDbConfig = new DatabaseConfiguration();
         mysqlDbConfig.setDatabaseHost(mySqlDbHost);
         mysqlDbConfig.setDatabaseName(mySqlDbName);
         mysqlDbConfig.setDatabasePassword(mySqlDbPassword);
@@ -32,10 +33,10 @@ public class InitMySQLTestDatabase extends DBExtensionTests {
         mysqlDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
         mysqlDbConfig.setDatabaseUser(mySqlDbUser);
         mysqlDbConfig.setUseSSL(false);
-    
+
         DBExtensionTestUtils.initTestData(mysqlDbConfig);
     }
-  
+
     @AfterSuite
     public void afterSuite() {
         DBExtensionTestUtils.cleanUpTestData(mysqlDbConfig);
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitPostgresTestDatabase.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitPostgresTestDatabase.java
index 78cfc3407..435f608f0 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitPostgresTestDatabase.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitPostgresTestDatabase.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database;
 
 import java.sql.SQLException;
@@ -18,11 +19,11 @@ public class InitPostgresTestDatabase extends DBExtensionTests {
     @BeforeSuite
     @Parameters({ "pgSqlDbName", "pgSqlDbHost", "pgSqlDbPort", "pgSqlDbUser", "pgSqlDbPassword", "pgSqlTestTable" })
     public void beforeSuite(
-            @Optional(DEFAULT_PGSQL_DB_NAME)   String pgSqlDbName,     @Optional(DEFAULT_PGSQL_HOST)  String pgSqlDbHost, 
-            @Optional(DEFAULT_PGSQL_PORT)      String pgSqlDbPort,     @Optional(DEFAULT_PGSQL_USER)  String pgSqlDbUser,
-            @Optional(DEFAULT_PGSQL_PASSWORD)  String pgSqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String pgSqlTestTable)
-                    throws DatabaseServiceException, SQLException {
-        
+            @Optional(DEFAULT_PGSQL_DB_NAME) String pgSqlDbName, @Optional(DEFAULT_PGSQL_HOST) String pgSqlDbHost,
+            @Optional(DEFAULT_PGSQL_PORT) String pgSqlDbPort, @Optional(DEFAULT_PGSQL_USER) String pgSqlDbUser,
+            @Optional(DEFAULT_PGSQL_PASSWORD) String pgSqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String pgSqlTestTable)
+            throws DatabaseServiceException, SQLException {
+
         pgsqlDbConfig = new DatabaseConfiguration();
         pgsqlDbConfig.setDatabaseHost(pgSqlDbHost);
         pgsqlDbConfig.setDatabaseName(pgSqlDbName);
@@ -31,10 +32,10 @@ public class InitPostgresTestDatabase extends DBExtensionTests {
         pgsqlDbConfig.setDatabaseType(PgSQLDatabaseService.DB_NAME);
         pgsqlDbConfig.setDatabaseUser(pgSqlDbUser);
         pgsqlDbConfig.setUseSSL(false);
-        
+
         DBExtensionTestUtils.initTestData(pgsqlDbConfig);
     }
-  
+
     @AfterSuite
     public void afterSuite() {
         DBExtensionTestUtils.cleanUpTestData(pgsqlDbConfig);
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitSQLiteTestDatabase.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitSQLiteTestDatabase.java
index f237bd651..aadd432f4 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitSQLiteTestDatabase.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/InitSQLiteTestDatabase.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database;
 
 import java.sql.SQLException;
@@ -14,17 +15,17 @@ public class InitSQLiteTestDatabase extends DBExtensionTests {
     private DatabaseConfiguration sqliteDbConfig;
 
     @BeforeSuite
-    @Parameters({ "sqliteDbName", "sqliteTestTable"})
+    @Parameters({ "sqliteDbName", "sqliteTestTable" })
     public void beforeSuite(
             @Optional(DEFAULT_SQLITE_DB_NAME) String sqliteDbName, @Optional(DEFAULT_TEST_TABLE) String sqliteTestTable)
-                    throws DatabaseServiceException, SQLException {
+            throws DatabaseServiceException, SQLException {
 
         sqliteDbConfig = new DatabaseConfiguration();
         sqliteDbConfig.setDatabaseName(sqliteDbName);
 
         DBExtensionTestUtils.initTestData(sqliteDbConfig);
     }
-  
+
     @AfterSuite
     public void afterSuite() {
         DBExtensionTestUtils.cleanUpTestData(sqliteDbConfig);
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java
index 1ef21450f..db4d15646 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/SimpleTextEncryptorTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database;
 
 import org.testng.Assert;
@@ -5,24 +6,24 @@ import org.testng.annotations.Test;
 
 public class SimpleTextEncryptorTest {
 
-  @Test
-  public void encrypt() {
-      SimpleTextEncryptor textEncryptor = new SimpleTextEncryptor("WEWssa!@d445d");
-      String password = "testpass";
-      String encPass = textEncryptor.encrypt(password);
-      Assert.assertNotNull(encPass);
-      Assert.assertNotEquals(encPass, password);
-   
-  }
+    @Test
+    public void encrypt() {
+        SimpleTextEncryptor textEncryptor = new SimpleTextEncryptor("WEWssa!@d445d");
+        String password = "testpass";
+        String encPass = textEncryptor.encrypt(password);
+        Assert.assertNotNull(encPass);
+        Assert.assertNotEquals(encPass, password);
 
-  @Test
-  public void decrypt() {       
-      SimpleTextEncryptor textEncryptor = new SimpleTextEncryptor("OOEWssa!@d445d");
-      String password = "testpass";
-      String encPass = textEncryptor.encrypt(password);
-      Assert.assertNotNull(encPass);
-      Assert.assertNotEquals(encPass, password);
-      String decPass = textEncryptor.decrypt(encPass);
-      Assert.assertEquals(decPass, password);
-  }
+    }
+
+    @Test
+    public void decrypt() {
+        SimpleTextEncryptor textEncryptor = new SimpleTextEncryptor("OOEWssa!@d445d");
+        String password = "testpass";
+        String encPass = textEncryptor.encrypt(password);
+        Assert.assertNotNull(encPass);
+        Assert.assertNotEquals(encPass, password);
+        String decPass = textEncryptor.decrypt(encPass);
+        Assert.assertEquals(decPass, password);
+    }
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java
index 96a2c0337..ca6c1038b 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ConnectCommandTest.java
@@ -27,10 +27,8 @@ import com.google.refine.extension.database.DatabaseService;
 import com.google.refine.extension.database.mysql.MySQLDatabaseService;
 import com.google.refine.util.ParsingUtilities;
 
-
 @Test(groups = { "requiresMySQL" })
 public class ConnectCommandTest extends DBExtensionTests {
-  
 
     @Mock
     private HttpServletRequest request;
@@ -39,17 +37,16 @@ public class ConnectCommandTest extends DBExtensionTests {
     private HttpServletResponse response;
 
     private DatabaseConfiguration testDbConfig;
-   // private String testTable;
-  
- 
+    // private String testTable;
+
     @BeforeTest
-    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-           @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-           @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-       
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
         MockitoAnnotations.initMocks(this);
-      
+
         testDbConfig = new DatabaseConfiguration();
         testDbConfig.setDatabaseHost(mySqlDbHost);
         testDbConfig.setDatabaseName(mySqlDbName);
@@ -58,15 +55,14 @@ public class ConnectCommandTest extends DBExtensionTests {
         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(mySqlDbUser);
         testDbConfig.setUseSSL(false);
-        
-        //testTable = mySqlTestTable;
-        //DBExtensionTestUtils.initTestData(testDbConfig);
-        
+
+        // testTable = mySqlTestTable;
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-        
+
     }
 
- 
     @Test
     public void testDoPost() throws IOException, ServletException {
 
@@ -77,37 +73,38 @@ public class ConnectCommandTest extends DBExtensionTests {
         when(request.getParameter("databasePassword")).thenReturn(testDbConfig.getDatabasePassword());
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-    
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(response.getWriter()).thenReturn(pw);
         ConnectCommand connectCommand = new ConnectCommand();
-       
+
         connectCommand.doPost(request, response);
-        
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String code = json.get("code").asText();
         Assert.assertEquals(code, "ok");
-        
+
         String databaseInfo = json.get("databaseInfo").asText();
         Assert.assertNotNull(databaseInfo);
     }
 
     @Test
     public void testCsrfProtection() throws ServletException, IOException {
-    	StringWriter sw = new StringWriter();
+        StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(response.getWriter()).thenReturn(pw);
         ConnectCommand connectCommand = new ConnectCommand();
-        
+
         connectCommand.doPost(request, response);
-    	Assert.assertEquals(
-    			ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", ObjectNode.class),
-    			ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
+        Assert.assertEquals(
+                ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}",
+                        ObjectNode.class),
+                ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
     }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
index 1dfafe3ce..95fbb3d74 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/ExecuteQueryCommandTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.cmd;
 
 import static org.mockito.Mockito.when;
@@ -28,40 +29,38 @@ import com.google.refine.util.ParsingUtilities;
 
 @Test(groups = { "requiresMySQL" })
 public class ExecuteQueryCommandTest extends DBExtensionTests {
-    
+
     @Mock
     private HttpServletRequest request;
 
     @Mock
     private HttpServletResponse response;
 
-  
     private DatabaseConfiguration testDbConfig;
     private String testTable;
-   
-  
-     @BeforeTest
-     @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-     public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-            @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-            @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-        
-         MockitoAnnotations.initMocks(this);
-         testDbConfig = new DatabaseConfiguration();
-         testDbConfig.setDatabaseHost(mySqlDbHost);
-         testDbConfig.setDatabaseName(mySqlDbName);
-         testDbConfig.setDatabasePassword(mySqlDbPassword);
-         testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
-         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
-         testDbConfig.setDatabaseUser(mySqlDbUser);
-         testDbConfig.setUseSSL(false);
-         
-         testTable = mySqlTestTable;
+
+    @BeforeTest
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
+        MockitoAnnotations.initMocks(this);
+        testDbConfig = new DatabaseConfiguration();
+        testDbConfig.setDatabaseHost(mySqlDbHost);
+        testDbConfig.setDatabaseName(mySqlDbName);
+        testDbConfig.setDatabasePassword(mySqlDbPassword);
+        testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
+        testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
+        testDbConfig.setDatabaseUser(mySqlDbUser);
+        testDbConfig.setUseSSL(false);
+
+        testTable = mySqlTestTable;
         // DBExtensionTestUtils.initTestData(testDbConfig);
-         
-         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-         
-     }
+
+        DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
+
+    }
 
     @Test
     public void testDoPost() throws IOException, ServletException {
@@ -74,20 +73,19 @@ public class ExecuteQueryCommandTest extends DBExtensionTests {
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("queryString")).thenReturn("SELECT count(*) FROM " + testTable);
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-        
 
         StringWriter sw = new StringWriter();
 
         PrintWriter pw = new PrintWriter(sw);
-        
+
         when(response.getWriter()).thenReturn(pw);
         ExecuteQueryCommand executeQueryCommand = new ExecuteQueryCommand();
-       
+
         executeQueryCommand.doPost(request, response);
-        
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String code = json.get("code").asText();
         Assert.assertEquals(code, "ok");
 
@@ -97,15 +95,16 @@ public class ExecuteQueryCommandTest extends DBExtensionTests {
 
     @Test
     public void testCsrfProtection() throws ServletException, IOException {
-    	StringWriter sw = new StringWriter();
+        StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(response.getWriter()).thenReturn(pw);
         ConnectCommand connectCommand = new ConnectCommand();
-        
+
         connectCommand.doPost(request, response);
-    	Assert.assertEquals(
-    			ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", ObjectNode.class),
-    			ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
+        Assert.assertEquals(
+                ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}",
+                        ObjectNode.class),
+                ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
     }
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
index 2225b41f7..40f709693 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.cmd;
 
 import static org.mockito.Mockito.when;
@@ -43,8 +44,8 @@ import com.google.refine.io.FileProjectManager;
 import com.google.refine.model.Project;
 import com.google.refine.util.ParsingUtilities;
 
-public class SavedConnectionCommandTest extends DBExtensionTests{
-    
+public class SavedConnectionCommandTest extends DBExtensionTests {
+
     @Mock
     private HttpServletRequest request;
 
@@ -52,37 +53,36 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
     private HttpServletResponse response;
 
     private DatabaseConfiguration testDbConfig;
-    
+
     private Project project;
     private ProjectMetadata metadata;
-    //private ImportingJob job;
+    // private ImportingJob job;
     private RefineServlet servlet;
 
-   // private String JSON_OPTION = "{\"mode\":\"row-based\"}}";
- 
-    
-    //System under test
+    // private String JSON_OPTION = "{\"mode\":\"row-based\"}}";
+
+    // System under test
     private SavedConnectionCommand SUT = null;
 
     @BeforeMethod
     public void setUp() throws IOException {
         MockitoAnnotations.initMocks(this);
-        
+
         File dir = DBExtensionTestUtils.createTempDirectory("OR_DBExtension_Test_WorkspaceDir");
         FileProjectManager.initialize(dir);
-        
+
         servlet = new RefineDbServletStub();
         ImportingManager.initialize(servlet);
         project = new Project();
         metadata = new ProjectMetadata();
-        //job = ImportingManager.createJob();
-     
+        // job = ImportingManager.createJob();
+
         metadata.setName("Save DB Config  Test Project");
         ProjectManager.singleton.registerProject(project, metadata);
         SUT = new SavedConnectionCommand();
-      
+
     }
-    
+
     @AfterMethod
     public void tearDown() {
         SUT = null;
@@ -90,35 +90,33 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
         response = null;
         project = null;
         metadata = null;
-       // ImportingManager.disposeJob(job.id);
-       // job = null;
-        //options = null;
+        // ImportingManager.disposeJob(job.id);
+        // job = null;
+        // options = null;
     }
-  
-     @BeforeTest
-     @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-     public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-            @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-            @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-        
+
+    @BeforeTest
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
         // MockitoAnnotations.initMocks(this);
-         testDbConfig = new DatabaseConfiguration();
-         testDbConfig.setDatabaseHost(mySqlDbHost);
-         testDbConfig.setDatabaseName(mySqlDbName);
-         testDbConfig.setDatabasePassword(mySqlDbPassword);
-         testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
-         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
-         testDbConfig.setDatabaseUser(mySqlDbUser);
-         testDbConfig.setUseSSL(false);
-       
-         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-         
-     }
-    
- 
-    
+        testDbConfig = new DatabaseConfiguration();
+        testDbConfig.setDatabaseHost(mySqlDbHost);
+        testDbConfig.setDatabaseName(mySqlDbName);
+        testDbConfig.setDatabasePassword(mySqlDbPassword);
+        testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
+        testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
+        testDbConfig.setDatabaseUser(mySqlDbUser);
+        testDbConfig.setUseSSL(false);
+
+        DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
+
+    }
+
     private void saveDatabaseConfiguration(String savedDbName) {
-        
+
         when(request.getParameter("connectionName")).thenReturn(savedDbName);
         when(request.getParameter("databaseType")).thenReturn(MySQLDatabaseService.DB_NAME);
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
@@ -129,7 +127,7 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         try {
             when(response.getWriter()).thenReturn(pw);
 
@@ -139,12 +137,12 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-       
+
     }
-    
+
     @Test
     public void testDoPost() throws IOException, ServletException {
-        
+
         when(request.getParameter("connectionName")).thenReturn("test-db-name");
         when(request.getParameter("databaseType")).thenReturn(MySQLDatabaseService.DB_NAME);
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
@@ -153,36 +151,35 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
         when(request.getParameter("databasePassword")).thenReturn(testDbConfig.getDatabasePassword());
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-       
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         when(response.getWriter()).thenReturn(pw);
-       
+
         SUT.doPost(request, response);
-        
+
         String result = sw.getBuffer().toString().trim();
         assertNotNull(result);
         assertFalse(result.isEmpty(), "Valid response Message expected!");
-        
+
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-       // System.out.println("json:" + json);
-        
+        // System.out.println("json:" + json);
+
         ArrayNode savedConnections = (ArrayNode) json.get("savedConnections");
         Assert.assertNotNull(savedConnections);
-        
+
         int len = savedConnections.size();
-        
+
         Assert.assertEquals(len, 1);
     }
 
     @Test
     public void testDoGet() throws IOException, ServletException {
         String testDbName = "testLocalDb";
-        //add saved connection
+        // add saved connection
         saveDatabaseConfiguration(testDbName);
-        
-        
+
         when(request.getParameter("connectionName")).thenReturn(testDbName);
         when(request.getParameter("databaseType")).thenReturn(MySQLDatabaseService.DB_NAME);
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
@@ -191,22 +188,22 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
         when(request.getParameter("databasePassword")).thenReturn(testDbConfig.getDatabasePassword());
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-       
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         when(response.getWriter()).thenReturn(pw);
-     
+
         SUT.doGet(request, response);
-      
+
         ObjectNode json = ParsingUtilities.mapper.readValue(sw.getBuffer().toString().trim(), ObjectNode.class);
-        
+
         ArrayNode savedConnections = (ArrayNode) json.get("savedConnections");
         Assert.assertNotNull(savedConnections);
-     
+
         Assert.assertEquals(savedConnections.size(), 1);
-        
-        ObjectNode sc = (ObjectNode)savedConnections.get(0);
+
+        ObjectNode sc = (ObjectNode) savedConnections.get(0);
         String connName = sc.get("connectionName").asText();
         Assert.assertEquals(connName, testDbName);
     }
@@ -215,14 +212,13 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
     public void testDoPut() throws IOException, ServletException {
         String testDbName = "testLocalDb";
         saveDatabaseConfiguration(testDbName);
-    
-       
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         when(response.getWriter()).thenReturn(pw);
-       
-        //modify database config
+
+        // modify database config
         String newHost = "localhost";
         when(request.getParameter("connectionName")).thenReturn(testDbName);
         when(request.getParameter("databaseType")).thenReturn(MySQLDatabaseService.DB_NAME);
@@ -232,16 +228,16 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
         when(request.getParameter("databasePassword")).thenReturn(testDbConfig.getDatabasePassword());
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-      
+
         SUT.doPut(request, response);
-        
+
         ObjectNode json = ParsingUtilities.mapper.readValue(sw.getBuffer().toString().trim(), ObjectNode.class);
         ArrayNode savedConnections = (ArrayNode) json.get("savedConnections");
         Assert.assertNotNull(savedConnections);
-       
+
         Assert.assertEquals(savedConnections.size(), 1);
-        
-        ObjectNode sc = (ObjectNode)savedConnections.get(0);
+
+        ObjectNode sc = (ObjectNode) savedConnections.get(0);
         String newDbHost = sc.get("databaseHost").asText();
         Assert.assertEquals(newDbHost, newHost);
     }
@@ -250,64 +246,62 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
     public void testDoDeleteValidConnectionName() {
         String testDbName = "testLocalDb";
         saveDatabaseConfiguration(testDbName);
-    
-       
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         try {
             when(response.getWriter()).thenReturn(pw);
             when(request.getParameter("connectionName")).thenReturn(testDbName);
             SUT.doDelete(request, response);
-            
+
             ObjectNode json = ParsingUtilities.mapper.readValue(sw.getBuffer().toString().trim(), ObjectNode.class);
             ArrayNode savedConnections = (ArrayNode) json.get("savedConnections");
             Assert.assertNotNull(savedConnections);
-           
+
             Assert.assertEquals(savedConnections.size(), 0);
-       
+
         } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
-    
+
     @Test
     public void testDoDeleteInValidConnectionName() {
         String testDbName = "testLocalDb";
         saveDatabaseConfiguration(testDbName);
-    
-       
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         try {
             when(response.getWriter()).thenReturn(pw);
-           
+
             when(request.getParameter("connectionName")).thenReturn("noDbName");
 
             SUT.doDelete(request, response);
-            
+
             ObjectNode json = ParsingUtilities.mapper.createObjectNode();
-            
+
             Assert.assertNotNull(json);
-       
-       
+
         } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
     }
-    
+
     /**
      * Added to check XSS invalid tokens
+     * 
      * @throws IOException
      * @throws ServletException
      */
     @Test
     public void testDoPostInvalidConnectionName() throws IOException, ServletException {
-        
-    	when(request.getParameter("connectionName")).thenReturn("<img></img>");
+
+        when(request.getParameter("connectionName")).thenReturn("<img></img>");
         when(request.getParameter("databaseType")).thenReturn(MySQLDatabaseService.DB_NAME);
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
         when(request.getParameter("databasePort")).thenReturn("" + testDbConfig.getDatabasePort());
@@ -315,29 +309,29 @@ public class SavedConnectionCommandTest extends DBExtensionTests{
         when(request.getParameter("databasePassword")).thenReturn(testDbConfig.getDatabasePassword());
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-       
+
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
-        
+
         when(response.getWriter()).thenReturn(pw);
-       
+
         SUT.doPost(request, response);
-        
+
         verify(response, times(1)).sendError(HttpStatus.SC_BAD_REQUEST, "Connection Name is Invalid. Expecting [a-zA-Z0-9._-]");
     }
 
     @Test
     public void testCsrfProtection() throws ServletException, IOException {
-    	StringWriter sw = new StringWriter();
+        StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(response.getWriter()).thenReturn(pw);
-        
+
         SUT.doPost(request, response);
-    	Assert.assertEquals(
-    			ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", ObjectNode.class),
-    			ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
+        Assert.assertEquals(
+                ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}",
+                        ObjectNode.class),
+                ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
     }
-    
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
index 7666e3828..5221dfe8f 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestConnectCommandTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.cmd;
 
 import static org.mockito.Mockito.when;
@@ -26,10 +27,9 @@ import com.google.refine.extension.database.DatabaseService;
 import com.google.refine.extension.database.mysql.MySQLDatabaseService;
 import com.google.refine.util.ParsingUtilities;
 
-
 @Test(groups = { "requiresMySQL" })
-public class TestConnectCommandTest extends DBExtensionTests{
-    
+public class TestConnectCommandTest extends DBExtensionTests {
+
     @Mock
     private HttpServletRequest request;
 
@@ -38,37 +38,34 @@ public class TestConnectCommandTest extends DBExtensionTests{
 
     private DatabaseConfiguration testDbConfig;
     // private String testTable;
-   
-  
-     @BeforeTest
-     @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-     public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-            @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-            @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-        
-         MockitoAnnotations.initMocks(this);
-       
-         testDbConfig = new DatabaseConfiguration();
-         testDbConfig.setDatabaseHost(mySqlDbHost);
-         testDbConfig.setDatabaseName(mySqlDbName);
-         testDbConfig.setDatabasePassword(mySqlDbPassword);
-         testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
-         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
-         testDbConfig.setDatabaseUser(mySqlDbUser);
-         testDbConfig.setUseSSL(false);
-         
-         //testTable = mySqlTestTable;
-        // DBExtensionTestUtils.initTestData(testDbConfig);
-         
-         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-         
-     }
-     
 
-     
+    @BeforeTest
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
+        MockitoAnnotations.initMocks(this);
+
+        testDbConfig = new DatabaseConfiguration();
+        testDbConfig.setDatabaseHost(mySqlDbHost);
+        testDbConfig.setDatabaseName(mySqlDbName);
+        testDbConfig.setDatabasePassword(mySqlDbPassword);
+        testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
+        testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
+        testDbConfig.setDatabaseUser(mySqlDbUser);
+        testDbConfig.setUseSSL(false);
+
+        // testTable = mySqlTestTable;
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
+        DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
+
+    }
+
     @Test
     public void testDoPost() throws IOException, ServletException {
-        
+
         when(request.getParameter("databaseType")).thenReturn(MySQLDatabaseService.DB_NAME);
         when(request.getParameter("databaseServer")).thenReturn(testDbConfig.getDatabaseHost());
         when(request.getParameter("databasePort")).thenReturn("" + testDbConfig.getDatabasePort());
@@ -76,7 +73,6 @@ public class TestConnectCommandTest extends DBExtensionTests{
         when(request.getParameter("databasePassword")).thenReturn(testDbConfig.getDatabasePassword());
         when(request.getParameter("initialDatabase")).thenReturn(testDbConfig.getDatabaseName());
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-        
 
         StringWriter sw = new StringWriter();
 
@@ -84,29 +80,30 @@ public class TestConnectCommandTest extends DBExtensionTests{
 
         when(response.getWriter()).thenReturn(pw);
         TestConnectCommand connectCommand = new TestConnectCommand();
-       
+
         connectCommand.doPost(request, response);
-        
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String code = json.get("code").asText();
         Assert.assertEquals(code, "ok");
-      
+
     }
-    
+
     @Test
     public void testCsrfProtection() throws ServletException, IOException {
-    	StringWriter sw = new StringWriter();
+        StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(response.getWriter()).thenReturn(pw);
         ConnectCommand connectCommand = new ConnectCommand();
-        
+
         connectCommand.doPost(request, response);
-    	Assert.assertEquals(
-    			ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", ObjectNode.class),
-    			ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
+        Assert.assertEquals(
+                ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}",
+                        ObjectNode.class),
+                ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
     }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
index ab56dc7e6..1351095ba 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/cmd/TestQueryCommandTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.cmd;
 
 import static org.mockito.Mockito.when;
@@ -28,41 +29,38 @@ import com.google.refine.util.ParsingUtilities;
 
 @Test(groups = { "requiresMySQL" })
 public class TestQueryCommandTest extends DBExtensionTests {
-    
+
     @Mock
     private HttpServletRequest request;
 
     @Mock
     private HttpServletResponse response;
 
-  
     private DatabaseConfiguration testDbConfig;
     private String testTable;
-   
-  
-     @BeforeTest
-     @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-     public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-            @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-            @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-        
-         MockitoAnnotations.initMocks(this);
-         testDbConfig = new DatabaseConfiguration();
-         testDbConfig.setDatabaseHost(mySqlDbHost);
-         testDbConfig.setDatabaseName(mySqlDbName);
-         testDbConfig.setDatabasePassword(mySqlDbPassword);
-         testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
-         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
-         testDbConfig.setDatabaseUser(mySqlDbUser);
-         testDbConfig.setUseSSL(false);
-         
-         testTable = mySqlTestTable;
-         //DBExtensionTestUtils.initTestData(testDbConfig);
-         
-         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-         
-     }
-    
+
+    @BeforeTest
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
+        MockitoAnnotations.initMocks(this);
+        testDbConfig = new DatabaseConfiguration();
+        testDbConfig.setDatabaseHost(mySqlDbHost);
+        testDbConfig.setDatabaseName(mySqlDbName);
+        testDbConfig.setDatabasePassword(mySqlDbPassword);
+        testDbConfig.setDatabasePort(Integer.parseInt(mySqlDbPort));
+        testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
+        testDbConfig.setDatabaseUser(mySqlDbUser);
+        testDbConfig.setUseSSL(false);
+
+        testTable = mySqlTestTable;
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
+        DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
+
+    }
 
     @Test
     public void testDoPost() throws IOException, ServletException {
@@ -82,12 +80,12 @@ public class TestQueryCommandTest extends DBExtensionTests {
 
         when(response.getWriter()).thenReturn(pw);
         TestQueryCommand executeQueryCommand = new TestQueryCommand();
-       
+
         executeQueryCommand.doPost(request, response);
-        
+
         String result = sw.getBuffer().toString().trim();
         ObjectNode json = ParsingUtilities.mapper.readValue(result, ObjectNode.class);
-   
+
         String code = json.get("code").asText();
         Assert.assertEquals(code, "ok");
 
@@ -95,19 +93,20 @@ public class TestQueryCommandTest extends DBExtensionTests {
         Assert.assertNotNull(queryResult);
 
     }
-    
+
     @Test
     public void testCsrfProtection() throws ServletException, IOException {
-    	StringWriter sw = new StringWriter();
+        StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
         when(response.getWriter()).thenReturn(pw);
         TestQueryCommand connectCommand = new TestQueryCommand();
-        
+
         connectCommand.doPost(request, response);
-    	Assert.assertEquals(
-    			ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", ObjectNode.class),
-    			ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
+        Assert.assertEquals(
+                ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}",
+                        ObjectNode.class),
+                ParsingUtilities.mapper.readValue(sw.toString(), ObjectNode.class));
     }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
index b63875abd..18824776c 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManagerTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.mariadb;
 
 import java.sql.Connection;
@@ -17,18 +18,15 @@ import com.google.refine.extension.database.DatabaseServiceException;
 
 @Test(groups = { "requiresMariaDB" })
 public class MariaDBConnectionManagerTest extends DBExtensionTests {
-    
-   
-    
+
     private DatabaseConfiguration testDbConfig;
-   
-    
+
     @BeforeTest
-    @Parameters({ "mariadbDbName", "mariadbDbHost", "mariadbDbPort", "mariadbDbUser", "mariadbDbPassword", "mariaTestTable"})
-    public void beforeTest(@Optional(DEFAULT_MARIADB_NAME) String mariaDbName,  @Optional(DEFAULT_MARIADB_HOST) String mariaDbHost, 
-           @Optional(DEFAULT_MARIADB_PORT)    String mariaDbPort,     @Optional(DEFAULT_MARIADB_USER) String mariaDbUser,
-           @Optional(DEFAULT_MARIADB_PASSWORD)  String mariaDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mariaDbTestTable) {
-       
+    @Parameters({ "mariadbDbName", "mariadbDbHost", "mariadbDbPort", "mariadbDbUser", "mariadbDbPassword", "mariaTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MARIADB_NAME) String mariaDbName, @Optional(DEFAULT_MARIADB_HOST) String mariaDbHost,
+            @Optional(DEFAULT_MARIADB_PORT) String mariaDbPort, @Optional(DEFAULT_MARIADB_USER) String mariaDbUser,
+            @Optional(DEFAULT_MARIADB_PASSWORD) String mariaDbPassword, @Optional(DEFAULT_TEST_TABLE) String mariaDbTestTable) {
+
         MockitoAnnotations.initMocks(this);
 
         testDbConfig = new DatabaseConfiguration();
@@ -39,38 +37,37 @@ public class MariaDBConnectionManagerTest extends DBExtensionTests {
         testDbConfig.setDatabaseType(MariaDBDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(mariaDbUser);
         testDbConfig.setUseSSL(false);
-        
+
 //        testTable = mariaDbTestTable;
-       // DBExtensionTestUtils.initTestData(testDbConfig);
-        
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(MariaDBDatabaseService.DB_NAME, MariaDBDatabaseService.getInstance());
-        
+
     }
-    
 
     @Test
-    public void testTestConnection() throws DatabaseServiceException {    
+    public void testTestConnection() throws DatabaseServiceException {
         boolean conn = MariaDBConnectionManager.getInstance().testConnection(testDbConfig);
         Assert.assertEquals(conn, true);
     }
 
     @Test
-    public void testGetConnection() throws DatabaseServiceException {   
-         Connection conn = MariaDBConnectionManager.getInstance().getConnection(testDbConfig, true);
-         Assert.assertNotNull(conn);
+    public void testGetConnection() throws DatabaseServiceException {
+        Connection conn = MariaDBConnectionManager.getInstance().getConnection(testDbConfig, true);
+        Assert.assertNotNull(conn);
     }
 
     @Test
     public void testShutdown() throws DatabaseServiceException, SQLException {
-         Connection conn = MariaDBConnectionManager.getInstance().getConnection(testDbConfig, true);
-         Assert.assertNotNull(conn);
-         
-         MariaDBConnectionManager.getInstance().shutdown();
-         
-         if(conn != null) {
-             Assert.assertEquals(conn.isClosed(), true);
-         }
-     
+        Connection conn = MariaDBConnectionManager.getInstance().getConnection(testDbConfig, true);
+        Assert.assertNotNull(conn);
+
+        MariaDBConnectionManager.getInstance().shutdown();
+
+        if (conn != null) {
+            Assert.assertEquals(conn.isClosed(), true);
+        }
+
     }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
index 3debead77..b0844b3cf 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mariadb/MariaDBDatabaseServiceTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.mariadb;
 
 import java.sql.Connection;
@@ -20,21 +21,18 @@ import com.google.refine.extension.database.model.DatabaseInfo;
 import com.google.refine.extension.database.model.DatabaseRow;
 
 @Test(groups = { "requiresMariaDB" })
-public class MariaDBDatabaseServiceTest extends DBExtensionTests{
-    
-    
-    
-   private DatabaseConfiguration testDbConfig;
-   
-   private String testTable;
-   
-    
+public class MariaDBDatabaseServiceTest extends DBExtensionTests {
+
+    private DatabaseConfiguration testDbConfig;
+
+    private String testTable;
+
     @BeforeTest
-    @Parameters({ "mariadbDbName", "mariadbDbHost", "mariadbDbPort", "mariadbDbUser", "mariadbDbPassword", "mariadbTestTable"})
-    public void beforeTest(@Optional(DEFAULT_MARIADB_NAME) String mariaDbName,  @Optional(DEFAULT_MARIADB_HOST) String mariaDbHost, 
-           @Optional(DEFAULT_MARIADB_PORT)    String mariaDbPort,     @Optional(DEFAULT_MARIADB_USER) String mariaDbUser,
-           @Optional(DEFAULT_MARIADB_PASSWORD)  String mariaDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mariaDbTestTable) {
-       
+    @Parameters({ "mariadbDbName", "mariadbDbHost", "mariadbDbPort", "mariadbDbUser", "mariadbDbPassword", "mariadbTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MARIADB_NAME) String mariaDbName, @Optional(DEFAULT_MARIADB_HOST) String mariaDbHost,
+            @Optional(DEFAULT_MARIADB_PORT) String mariaDbPort, @Optional(DEFAULT_MARIADB_USER) String mariaDbUser,
+            @Optional(DEFAULT_MARIADB_PASSWORD) String mariaDbPassword, @Optional(DEFAULT_TEST_TABLE) String mariaDbTestTable) {
+
         MockitoAnnotations.initMocks(this);
 
         testDbConfig = new DatabaseConfiguration();
@@ -45,89 +43,88 @@ public class MariaDBDatabaseServiceTest extends DBExtensionTests{
         testDbConfig.setDatabaseType(MariaDBDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(mariaDbUser);
         testDbConfig.setUseSSL(false);
-        
+
         testTable = mariaDbTestTable;
-        //DBExtensionTestUtils.initTestData(testDbConfig);
-        
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(MariaDBDatabaseService.DB_NAME, MariaDBDatabaseService.getInstance());
-        
+
     }
-   
+
     @Test
     public void testGetDatabaseUrl() {
-        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService)DatabaseService.get(MariaDBDatabaseService.DB_NAME);
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService.get(MariaDBDatabaseService.DB_NAME);
         String dbUrl = pgSqlService.getDatabaseUrl(testDbConfig);
-        //System.out.println("dbUrl:" + dbUrl);
+        // System.out.println("dbUrl:" + dbUrl);
         Assert.assertNotNull(dbUrl);
         Assert.assertEquals(dbUrl, DBExtensionTestUtils.getJDBCUrl(testDbConfig));
     }
 
-     @Test
-     public void testGetConnection() throws DatabaseServiceException {
-         MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService)DatabaseService.get(MariaDBDatabaseService.DB_NAME);
-         Connection conn = pgSqlService.getConnection(testDbConfig);
-    
-         Assert.assertNotNull(conn);
-     }
+    @Test
+    public void testGetConnection() throws DatabaseServiceException {
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService.get(MariaDBDatabaseService.DB_NAME);
+        Connection conn = pgSqlService.getConnection(testDbConfig);
 
-     @Test
-     public void testTestConnection() throws DatabaseServiceException {
-         MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService)DatabaseService.get(MariaDBDatabaseService.DB_NAME);
-                
-         boolean result = pgSqlService.testConnection(testDbConfig);
-         Assert.assertEquals(result, true);
-     }
+        Assert.assertNotNull(conn);
+    }
 
-     @Test
-     public void testConnect() throws DatabaseServiceException {
-        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService)DatabaseService.get(MariaDBDatabaseService.DB_NAME);
+    @Test
+    public void testTestConnection() throws DatabaseServiceException {
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService.get(MariaDBDatabaseService.DB_NAME);
+
+        boolean result = pgSqlService.testConnection(testDbConfig);
+        Assert.assertEquals(result, true);
+    }
+
+    @Test
+    public void testConnect() throws DatabaseServiceException {
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService.get(MariaDBDatabaseService.DB_NAME);
         DatabaseInfo databaseInfo = pgSqlService.connect(testDbConfig);
         Assert.assertNotNull(databaseInfo);
-     }
-     
-     @Test
-     public void testExecuteQuery() throws DatabaseServiceException {
-         MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService
-                 .get(MariaDBDatabaseService.DB_NAME);
-         DatabaseInfo databaseInfo = pgSqlService.testQuery(testDbConfig, "SELECT * FROM " + testTable);
+    }
 
-         Assert.assertNotNull(databaseInfo);
-     }
+    @Test
+    public void testExecuteQuery() throws DatabaseServiceException {
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService
+                .get(MariaDBDatabaseService.DB_NAME);
+        DatabaseInfo databaseInfo = pgSqlService.testQuery(testDbConfig, "SELECT * FROM " + testTable);
 
-     @Test
-     public void testBuildLimitQuery() {
-         MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService.get(MariaDBDatabaseService.DB_NAME);
-         String limitQuery = pgSqlService.buildLimitQuery(100, 0, "SELECT * FROM " + testTable);
-         Assert.assertNotNull(limitQuery);
-         Assert.assertEquals(limitQuery, "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
-     }
+        Assert.assertNotNull(databaseInfo);
+    }
 
-     @Test
-     public void testGetRows() throws DatabaseServiceException {
-         MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService
-                     .get(MariaDBDatabaseService.DB_NAME);
-             List<DatabaseRow> dbRows = pgSqlService.getRows(testDbConfig, "SELECT * FROM " + testTable);
+    @Test
+    public void testBuildLimitQuery() {
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService.get(MariaDBDatabaseService.DB_NAME);
+        String limitQuery = pgSqlService.buildLimitQuery(100, 0, "SELECT * FROM " + testTable);
+        Assert.assertNotNull(limitQuery);
+        Assert.assertEquals(limitQuery, "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
+    }
 
-             Assert.assertNotNull(dbRows);
-     }
+    @Test
+    public void testGetRows() throws DatabaseServiceException {
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService
+                .get(MariaDBDatabaseService.DB_NAME);
+        List<DatabaseRow> dbRows = pgSqlService.getRows(testDbConfig, "SELECT * FROM " + testTable);
 
-     @Test
-     public void testGetInstance() {
-         MariaDBDatabaseService instance = MariaDBDatabaseService.getInstance();
-         Assert.assertNotNull(instance);
-     }
+        Assert.assertNotNull(dbRows);
+    }
 
-     @Test
-     public void testGetColumns() throws DatabaseServiceException {
-         List<DatabaseColumn> dbColumns;
+    @Test
+    public void testGetInstance() {
+        MariaDBDatabaseService instance = MariaDBDatabaseService.getInstance();
+        Assert.assertNotNull(instance);
+    }
 
-         MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService
-                 .get(MariaDBDatabaseService.DB_NAME);
+    @Test
+    public void testGetColumns() throws DatabaseServiceException {
+        List<DatabaseColumn> dbColumns;
 
-         dbColumns = pgSqlService.getColumns(testDbConfig, "SELECT * FROM " + testTable);
+        MariaDBDatabaseService pgSqlService = (MariaDBDatabaseService) DatabaseService
+                .get(MariaDBDatabaseService.DB_NAME);
 
-         Assert.assertNotNull(dbColumns);
-     }
-     
+        dbColumns = pgSqlService.getColumns(testDbConfig, "SELECT * FROM " + testTable);
+
+        Assert.assertNotNull(dbColumns);
+    }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
index bd01aba75..f896a69fc 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLConnectionManagerTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.mysql;
 
 import java.sql.Connection;
@@ -17,16 +18,15 @@ import com.google.refine.extension.database.DatabaseServiceException;
 
 @Test(groups = { "requiresMySQL" })
 public class MySQLConnectionManagerTest extends DBExtensionTests {
-  
+
     private DatabaseConfiguration testDbConfig;
-    
-    
+
     @BeforeTest
-    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-           @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-           @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-       
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
         MockitoAnnotations.initMocks(this);
 
         testDbConfig = new DatabaseConfiguration();
@@ -37,40 +37,39 @@ public class MySQLConnectionManagerTest extends DBExtensionTests {
         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(mySqlDbUser);
         testDbConfig.setUseSSL(false);
-        
-        //testTable = mySqlTestTable;
-       // DBExtensionTestUtils.initTestData(testDbConfig);
-        
+
+        // testTable = mySqlTestTable;
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-        
+
     }
-    
 
     @Test
     public void testTestConnection() throws DatabaseServiceException {
-        
+
         boolean conn = MySQLConnectionManager.getInstance().testConnection(testDbConfig);
         Assert.assertEquals(conn, true);
     }
 
     @Test
     public void testGetConnection() throws DatabaseServiceException {
-      
-         Connection conn = MySQLConnectionManager.getInstance().getConnection(testDbConfig, true);
-         Assert.assertNotNull(conn);
+
+        Connection conn = MySQLConnectionManager.getInstance().getConnection(testDbConfig, true);
+        Assert.assertNotNull(conn);
     }
 
     @Test
     public void testShutdown() throws DatabaseServiceException, SQLException {
-    
-         Connection conn = MySQLConnectionManager.getInstance().getConnection(testDbConfig, true);
-         Assert.assertNotNull(conn);
-         
-         MySQLConnectionManager.getInstance().shutdown();
-         
-         if(conn != null) {
-             Assert.assertEquals(conn.isClosed(), true);
-         }
+
+        Connection conn = MySQLConnectionManager.getInstance().getConnection(testDbConfig, true);
+        Assert.assertNotNull(conn);
+
+        MySQLConnectionManager.getInstance().shutdown();
+
+        if (conn != null) {
+            Assert.assertEquals(conn.isClosed(), true);
+        }
     }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
index 0c58301e8..6c1ba3784 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/mysql/MySQLDatabaseServiceTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.mysql;
 
 import java.sql.Connection;
@@ -19,19 +20,18 @@ import com.google.refine.extension.database.model.DatabaseColumn;
 import com.google.refine.extension.database.model.DatabaseInfo;
 import com.google.refine.extension.database.model.DatabaseRow;
 
-
 @Test(groups = { "requiresMySQL" })
-public class MySQLDatabaseServiceTest extends DBExtensionTests{
-    
+public class MySQLDatabaseServiceTest extends DBExtensionTests {
+
     private DatabaseConfiguration testDbConfig;
     private String testTable;
-    
+
     @BeforeTest
-    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable"})
-    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName,  @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost, 
-           @Optional(DEFAULT_MYSQL_PORT)    String mySqlDbPort,     @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
-           @Optional(DEFAULT_MYSQL_PASSWORD)  String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String mySqlTestTable) {
-       
+    @Parameters({ "mySqlDbName", "mySqlDbHost", "mySqlDbPort", "mySqlDbUser", "mySqlDbPassword", "mySqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_MYSQL_DB_NAME) String mySqlDbName, @Optional(DEFAULT_MYSQL_HOST) String mySqlDbHost,
+            @Optional(DEFAULT_MYSQL_PORT) String mySqlDbPort, @Optional(DEFAULT_MYSQL_USER) String mySqlDbUser,
+            @Optional(DEFAULT_MYSQL_PASSWORD) String mySqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String mySqlTestTable) {
+
         MockitoAnnotations.initMocks(this);
 
         testDbConfig = new DatabaseConfiguration();
@@ -42,92 +42,88 @@ public class MySQLDatabaseServiceTest extends DBExtensionTests{
         testDbConfig.setDatabaseType(MySQLDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(mySqlDbUser);
         testDbConfig.setUseSSL(false);
-        
+
         testTable = mySqlTestTable;
-        //DBExtensionTestUtils.initTestData(testDbConfig);
-        
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(MySQLDatabaseService.DB_NAME, MySQLDatabaseService.getInstance());
-        
+
     }
-   
 
     @Test
     public void testGetDatabaseUrl() {
-        MySQLDatabaseService pgSqlService = (MySQLDatabaseService)DatabaseService.get(MySQLDatabaseService.DB_NAME);
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService.get(MySQLDatabaseService.DB_NAME);
         String dbUrl = pgSqlService.getDatabaseUrl(testDbConfig);
-        //System.out.println("dbUrl:" + dbUrl);
+        // System.out.println("dbUrl:" + dbUrl);
         Assert.assertNotNull(dbUrl);
         Assert.assertEquals(dbUrl, DBExtensionTestUtils.getJDBCUrl(testDbConfig));
     }
- 
 
-     @Test
-     public void testGetConnection() throws DatabaseServiceException {    
-         MySQLDatabaseService pgSqlService = (MySQLDatabaseService)DatabaseService.get(MySQLDatabaseService.DB_NAME);
-         Connection conn = pgSqlService.getConnection(testDbConfig);
-    
-         Assert.assertNotNull(conn);
-     }
+    @Test
+    public void testGetConnection() throws DatabaseServiceException {
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService.get(MySQLDatabaseService.DB_NAME);
+        Connection conn = pgSqlService.getConnection(testDbConfig);
 
-     @Test
-     public void testTestConnection() throws DatabaseServiceException {
-         MySQLDatabaseService pgSqlService = (MySQLDatabaseService)DatabaseService.get(MySQLDatabaseService.DB_NAME);
-                
-         boolean result = pgSqlService.testConnection(testDbConfig);
-         Assert.assertEquals(result, true);
-     }
+        Assert.assertNotNull(conn);
+    }
 
-     @Test
-     public void testConnect() throws DatabaseServiceException {
-        MySQLDatabaseService pgSqlService = (MySQLDatabaseService)DatabaseService.get(MySQLDatabaseService.DB_NAME);
+    @Test
+    public void testTestConnection() throws DatabaseServiceException {
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService.get(MySQLDatabaseService.DB_NAME);
+
+        boolean result = pgSqlService.testConnection(testDbConfig);
+        Assert.assertEquals(result, true);
+    }
+
+    @Test
+    public void testConnect() throws DatabaseServiceException {
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService.get(MySQLDatabaseService.DB_NAME);
         DatabaseInfo databaseInfo = pgSqlService.connect(testDbConfig);
         Assert.assertNotNull(databaseInfo);
-     }
-     
-     @Test
-     public void testExecuteQuery() throws DatabaseServiceException {
+    }
 
-         MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService
-                 .get(MySQLDatabaseService.DB_NAME);
-         DatabaseInfo databaseInfo = pgSqlService.testQuery(testDbConfig, "SELECT * FROM " + testTable);
+    @Test
+    public void testExecuteQuery() throws DatabaseServiceException {
 
-         Assert.assertNotNull(databaseInfo);
-     }
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService
+                .get(MySQLDatabaseService.DB_NAME);
+        DatabaseInfo databaseInfo = pgSqlService.testQuery(testDbConfig, "SELECT * FROM " + testTable);
 
-     @Test
-     public void testBuildLimitQuery() {
-         MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService.get(MySQLDatabaseService.DB_NAME);
-         String limitQuery = pgSqlService.buildLimitQuery(100, 0, "SELECT * FROM " + testTable);
-         Assert.assertNotNull(limitQuery);
-         Assert.assertEquals(limitQuery, "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
-     }
+        Assert.assertNotNull(databaseInfo);
+    }
 
-     @Test
-     public void testGetRows() throws DatabaseServiceException {
-         MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService
-                 .get(MySQLDatabaseService.DB_NAME);
-         List<DatabaseRow> dbRows = pgSqlService.getRows(testDbConfig, "SELECT * FROM " + testTable);
+    @Test
+    public void testBuildLimitQuery() {
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService.get(MySQLDatabaseService.DB_NAME);
+        String limitQuery = pgSqlService.buildLimitQuery(100, 0, "SELECT * FROM " + testTable);
+        Assert.assertNotNull(limitQuery);
+        Assert.assertEquals(limitQuery, "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
+    }
 
-         Assert.assertNotNull(dbRows);
-     }
+    @Test
+    public void testGetRows() throws DatabaseServiceException {
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService
+                .get(MySQLDatabaseService.DB_NAME);
+        List<DatabaseRow> dbRows = pgSqlService.getRows(testDbConfig, "SELECT * FROM " + testTable);
 
-     @Test
-     public void testGetInstance() {
-         MySQLDatabaseService instance = MySQLDatabaseService.getInstance();
-         Assert.assertNotNull(instance);
-     }
+        Assert.assertNotNull(dbRows);
+    }
 
-     @Test
-     public void testGetColumns() throws DatabaseServiceException {
-         List<DatabaseColumn> dbColumns;
-         MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService
-                 .get(MySQLDatabaseService.DB_NAME);
+    @Test
+    public void testGetInstance() {
+        MySQLDatabaseService instance = MySQLDatabaseService.getInstance();
+        Assert.assertNotNull(instance);
+    }
 
-         dbColumns = pgSqlService.getColumns(testDbConfig, "SELECT * FROM " + testTable);
+    @Test
+    public void testGetColumns() throws DatabaseServiceException {
+        List<DatabaseColumn> dbColumns;
+        MySQLDatabaseService pgSqlService = (MySQLDatabaseService) DatabaseService
+                .get(MySQLDatabaseService.DB_NAME);
 
-         Assert.assertNotNull(dbColumns);
-     }
-     
+        dbColumns = pgSqlService.getColumns(testDbConfig, "SELECT * FROM " + testTable);
 
+        Assert.assertNotNull(dbColumns);
+    }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
index 4c4d744d8..9f3a85b85 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManagerTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.pgsql;
 
 import java.sql.Connection;
@@ -15,21 +16,19 @@ import com.google.refine.extension.database.DatabaseConfiguration;
 import com.google.refine.extension.database.DatabaseService;
 import com.google.refine.extension.database.DatabaseServiceException;
 
-
 @Test(groups = { "requiresPgSQL" })
 public class PgSQLConnectionManagerTest extends DBExtensionTests {
-   
+
     private DatabaseConfiguration testDbConfig;
-    
-    
+
     @BeforeTest
-    @Parameters({ "pgSqlDbName", "pgSqlDbHost", "pgSqlDbPort", "pgSqlDbUser", "pgSqlDbPassword", "pgSqlTestTable"})
-    public void beforeTest(@Optional(DEFAULT_PGSQL_DB_NAME) String pgSqlDbName,  @Optional(DEFAULT_PGSQL_HOST) String pgSqlDbHost, 
-           @Optional(DEFAULT_PGSQL_PORT)    String pgSqlDbPort,     @Optional(DEFAULT_PGSQL_USER) String pgSqlDbUser,
-           @Optional(DEFAULT_PGSQL_PASSWORD)  String pgSqlDbPassword, @Optional(DEFAULT_TEST_TABLE)  String pgSqlTestTable) {
-       
+    @Parameters({ "pgSqlDbName", "pgSqlDbHost", "pgSqlDbPort", "pgSqlDbUser", "pgSqlDbPassword", "pgSqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_PGSQL_DB_NAME) String pgSqlDbName, @Optional(DEFAULT_PGSQL_HOST) String pgSqlDbHost,
+            @Optional(DEFAULT_PGSQL_PORT) String pgSqlDbPort, @Optional(DEFAULT_PGSQL_USER) String pgSqlDbUser,
+            @Optional(DEFAULT_PGSQL_PASSWORD) String pgSqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String pgSqlTestTable) {
+
         MockitoAnnotations.initMocks(this);
-       
+
         testDbConfig = new DatabaseConfiguration();
         testDbConfig.setDatabaseHost(pgSqlDbHost);
         testDbConfig.setDatabaseName(pgSqlDbName);
@@ -38,42 +37,40 @@ public class PgSQLConnectionManagerTest extends DBExtensionTests {
         testDbConfig.setDatabaseType(PgSQLDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(pgSqlDbUser);
         testDbConfig.setUseSSL(false);
-        
-        //testTable = mySqlTestTable;
-        //DBExtensionTestUtils.initTestData(testDbConfig);
-        
-        DatabaseService.DBType.registerDatabase(PgSQLDatabaseService.DB_NAME, PgSQLDatabaseService.getInstance());
-        
-    }
-    
 
-  
+        // testTable = mySqlTestTable;
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
+        DatabaseService.DBType.registerDatabase(PgSQLDatabaseService.DB_NAME, PgSQLDatabaseService.getInstance());
+
+    }
+
     @Test
     public void testTestConnection() throws DatabaseServiceException {
-        
+
         boolean isConnected = PgSQLConnectionManager.getInstance().testConnection(testDbConfig);
         Assert.assertEquals(isConnected, true);
     }
 
     @Test
     public void testGetConnection() throws DatabaseServiceException {
-      
-         Connection conn = PgSQLConnectionManager.getInstance().getConnection(testDbConfig, true);
-         Assert.assertNotNull(conn);
+
+        Connection conn = PgSQLConnectionManager.getInstance().getConnection(testDbConfig, true);
+        Assert.assertNotNull(conn);
     }
 
     @Test
     public void testShutdown() throws DatabaseServiceException, SQLException {
-    
-         Connection conn = PgSQLConnectionManager.getInstance().getConnection(testDbConfig, true);
-         Assert.assertNotNull(conn);
-         
-         PgSQLConnectionManager.getInstance().shutdown();
-         
-         if(conn != null) {
-             Assert.assertEquals(conn.isClosed(), true);
-         }
-     
+
+        Connection conn = PgSQLConnectionManager.getInstance().getConnection(testDbConfig, true);
+        Assert.assertNotNull(conn);
+
+        PgSQLConnectionManager.getInstance().shutdown();
+
+        if (conn != null) {
+            Assert.assertEquals(conn.isClosed(), true);
+        }
+
     }
 
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
index 664ba2900..fc5a0306c 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/pgsql/PgSQLDatabaseServiceTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.database.pgsql;
 
 import java.sql.Connection;
@@ -20,18 +21,17 @@ import com.google.refine.extension.database.model.DatabaseInfo;
 import com.google.refine.extension.database.model.DatabaseRow;
 
 @Test(groups = { "requiresPgSQL" })
-public class PgSQLDatabaseServiceTest extends DBExtensionTests{
-  
+public class PgSQLDatabaseServiceTest extends DBExtensionTests {
+
     private DatabaseConfiguration testDbConfig;
     private String testTable;
-  
- 
+
     @BeforeTest
-    @Parameters({ "pgSqlDbName", "pgSqlDbHost", "pgSqlDbPort", "pgSqlDbUser", "pgSqlDbPassword", "pgSqlTestTable"})
-    public void beforeTest(@Optional(DEFAULT_PGSQL_DB_NAME) String pgSqlDbName,  @Optional(DEFAULT_PGSQL_HOST) String pgSqlDbHost, 
-           @Optional(DEFAULT_PGSQL_PORT)        String pgSqlDbPort,     @Optional(DEFAULT_PGSQL_USER)   String pgSqlDbUser,
-           @Optional(DEFAULT_PGSQL_PASSWORD)    String pgSqlDbPassword, @Optional(DEFAULT_TEST_TABLE)   String pgSqlTestTable) {
-       
+    @Parameters({ "pgSqlDbName", "pgSqlDbHost", "pgSqlDbPort", "pgSqlDbUser", "pgSqlDbPassword", "pgSqlTestTable" })
+    public void beforeTest(@Optional(DEFAULT_PGSQL_DB_NAME) String pgSqlDbName, @Optional(DEFAULT_PGSQL_HOST) String pgSqlDbHost,
+            @Optional(DEFAULT_PGSQL_PORT) String pgSqlDbPort, @Optional(DEFAULT_PGSQL_USER) String pgSqlDbUser,
+            @Optional(DEFAULT_PGSQL_PASSWORD) String pgSqlDbPassword, @Optional(DEFAULT_TEST_TABLE) String pgSqlTestTable) {
+
         MockitoAnnotations.initMocks(this);
         testDbConfig = new DatabaseConfiguration();
         testDbConfig.setDatabaseHost(pgSqlDbHost);
@@ -41,38 +41,35 @@ public class PgSQLDatabaseServiceTest extends DBExtensionTests{
         testDbConfig.setDatabaseType(PgSQLDatabaseService.DB_NAME);
         testDbConfig.setDatabaseUser(pgSqlDbUser);
         testDbConfig.setUseSSL(false);
-        
+
         testTable = pgSqlTestTable;
-        //DBExtensionTestUtils.initTestData(testDbConfig);
-        
+        // DBExtensionTestUtils.initTestData(testDbConfig);
+
         DatabaseService.DBType.registerDatabase(PgSQLDatabaseService.DB_NAME, PgSQLDatabaseService.getInstance());
     }
-   
-
 
     @Test
     public void testGetDatabaseUrl() {
-        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService)DatabaseService.get(PgSQLDatabaseService.DB_NAME);
+        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService) DatabaseService.get(PgSQLDatabaseService.DB_NAME);
         String dbUrl = pgSqlService.getDatabaseUrl(testDbConfig);
-       
+
         Assert.assertNotNull(dbUrl);
         Assert.assertEquals(dbUrl, DBExtensionTestUtils.getJDBCUrl(testDbConfig));
     }
- 
 
     @Test
     public void testGetConnection() throws DatabaseServiceException {
-        
-        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService)DatabaseService.get(PgSQLDatabaseService.DB_NAME);
+
+        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService) DatabaseService.get(PgSQLDatabaseService.DB_NAME);
         Connection conn = pgSqlService.getConnection(testDbConfig);
-   
+
         Assert.assertNotNull(conn);
     }
 
     @Test
     public void testTestConnection() throws DatabaseServiceException {
-        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService)DatabaseService.get(PgSQLDatabaseService.DB_NAME);
-               
+        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService) DatabaseService.get(PgSQLDatabaseService.DB_NAME);
+
         boolean result = pgSqlService.testConnection(testDbConfig);
         Assert.assertEquals(result, true);
     }
@@ -80,11 +77,11 @@ public class PgSQLDatabaseServiceTest extends DBExtensionTests{
     @Test
     public void testConnect() throws DatabaseServiceException {
 
-       PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService)DatabaseService.get(PgSQLDatabaseService.DB_NAME);
-       DatabaseInfo databaseInfo = pgSqlService.connect(testDbConfig);
-       Assert.assertNotNull(databaseInfo);
+        PgSQLDatabaseService pgSqlService = (PgSQLDatabaseService) DatabaseService.get(PgSQLDatabaseService.DB_NAME);
+        DatabaseInfo databaseInfo = pgSqlService.connect(testDbConfig);
+        Assert.assertNotNull(databaseInfo);
     }
-    
+
     @Test
     public void testExecuteQuery() throws DatabaseServiceException {
 
@@ -131,5 +128,4 @@ public class PgSQLDatabaseServiceTest extends DBExtensionTests{
 
     }
 
-
 }
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManagerTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManagerTest.java
index 693500197..2daf059c5 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManagerTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManagerTest.java
@@ -49,8 +49,8 @@ public class SQLiteConnectionManagerTest extends DBExtensionTests {
     @BeforeTest
     @Parameters({ "sqliteDbName", "sqliteTestTable" })
     public void beforeTest(@Optional(DEFAULT_SQLITE_DB_NAME) String sqliteDbName,
-                    @Optional(DEFAULT_TEST_TABLE) String sqliteTestTable)
-                    throws DatabaseServiceException, SQLException {
+            @Optional(DEFAULT_TEST_TABLE) String sqliteTestTable)
+            throws DatabaseServiceException, SQLException {
 
         MockitoAnnotations.initMocks(this);
 
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteDatabaseServiceTest.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteDatabaseServiceTest.java
index a313f25d8..c29cc82c2 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteDatabaseServiceTest.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/sqlite/SQLiteDatabaseServiceTest.java
@@ -51,8 +51,8 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     @BeforeTest
     @Parameters({ "sqliteDbName", "sqliteTestTable" })
     public void beforeTest(@Optional(DEFAULT_SQLITE_DB_NAME) String sqliteDbName,
-                    @Optional(DEFAULT_TEST_TABLE) String sqliteTestTable)
-                    throws DatabaseServiceException, SQLException {
+            @Optional(DEFAULT_TEST_TABLE) String sqliteTestTable)
+            throws DatabaseServiceException, SQLException {
 
         MockitoAnnotations.initMocks(this);
         testDbConfig = new DatabaseConfiguration();
@@ -77,7 +77,7 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     @Test
     public void testGetDatabaseUrl() {
         SQLiteDatabaseService sqLiteDatabaseService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
         String dbUrl = sqLiteDatabaseService.getDatabaseUrl(testDbConfig);
 
         Assert.assertNotNull(dbUrl);
@@ -88,7 +88,7 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     public void testGetConnection() throws DatabaseServiceException {
 
         SQLiteDatabaseService sqLiteDatabaseService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
         Connection conn = sqLiteDatabaseService.getConnection(testDbConfig);
 
         Assert.assertNotNull(conn);
@@ -97,7 +97,7 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     @Test
     public void testTestConnection() throws DatabaseServiceException {
         SQLiteDatabaseService sqLiteDatabaseService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
 
         boolean result = sqLiteDatabaseService.testConnection(testDbConfig);
         Assert.assertTrue(result);
@@ -107,7 +107,7 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     public void testConnect() throws DatabaseServiceException {
 
         SQLiteDatabaseService sqLiteDatabaseService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
         DatabaseInfo databaseInfo = sqLiteDatabaseService.connect(testDbConfig);
         Assert.assertNotNull(databaseInfo);
     }
@@ -115,7 +115,7 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     @Test
     public void testExecuteQuery() throws DatabaseServiceException {
         SQLiteDatabaseService sqLiteDatabaseService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
         DatabaseInfo databaseInfo = sqLiteDatabaseService.testQuery(testDbConfig, "SELECT * FROM " + testTable);
 
         Assert.assertNotNull(databaseInfo);
@@ -124,17 +124,17 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
     @Test
     public void testBuildLimitQuery() {
         SQLiteDatabaseService sqliteSqlService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
         String limitQuery = sqliteSqlService.buildLimitQuery(100, 0, "SELECT * FROM " + testTable);
         Assert.assertNotNull(limitQuery);
         Assert.assertEquals(limitQuery,
-                        "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
+                "SELECT * FROM (SELECT * FROM " + testTable + ") data LIMIT " + 100 + " OFFSET " + 0 + ";");
     }
 
     @Test
     public void testGetRows() throws DatabaseServiceException {
         SQLiteDatabaseService sqliteSqlService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
         List<DatabaseRow> dbRows = sqliteSqlService.getRows(testDbConfig, "SELECT * FROM " + testTable);
 
         Assert.assertNotNull(dbRows);
@@ -151,7 +151,7 @@ public class SQLiteDatabaseServiceTest extends DBExtensionTests {
         List<DatabaseColumn> dbColumns;
 
         SQLiteDatabaseService sqliteSqlService = (SQLiteDatabaseService) DatabaseService
-                        .get(SQLiteDatabaseService.DB_NAME);
+                .get(SQLiteDatabaseService.DB_NAME);
 
         dbColumns = sqliteSqlService.getColumns(testDbConfig, "SELECT * FROM " + testTable);
 
diff --git a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java
index c76e85c26..fd5f5a428 100644
--- a/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java
+++ b/OpenRefine/extensions/database/tests/src/com/google/refine/extension/database/stub/RefineDbServletStub.java
@@ -50,18 +50,18 @@ import com.google.refine.commands.Command;
 public class RefineDbServletStub extends RefineServlet {
 
     private static File tempDir = null;
-    
-    //requirement of extending HttpServlet, not required for testing
+
+    // requirement of extending HttpServlet, not required for testing
     private static final long serialVersionUID = 1L;
 
-    public void wrapService(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+    public void wrapService(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.service(request, response);
     }
 
-    public String wrapGetCommandName(HttpServletRequest request){
+    public String wrapGetCommandName(HttpServletRequest request) {
         return super.getCommandKey(request);
     }
-    
+
     @Override
     public File getTempDir() {
         if (tempDir == null) {
@@ -69,27 +69,29 @@ public class RefineDbServletStub extends RefineServlet {
                 tempDir = File.createTempFile("refine-test-dir", "");
                 tempDir.deleteOnExit();
             } catch (IOException e) {
-                throw new RuntimeException("Failed to create temp directory",e);
+                throw new RuntimeException("Failed to create temp directory", e);
             }
         }
-        return tempDir; 
+        return tempDir;
     }
 
-    //-------------------helper methods--------------
+    // -------------------helper methods--------------
     /**
      * Helper method for inserting a mock object
+     * 
      * @param commandName
      * @param command
      */
-    public void insertCommand(String commandName, Command command ){
+    public void insertCommand(String commandName, Command command) {
         registerOneCommand("core/" + commandName, command);
     }
 
     /**
      * Helper method for clearing up after testing
+     * 
      * @param commandName
      */
-    public void removeCommand( String commandName ){
+    public void removeCommand(String commandName) {
         unregisterCommand("core/" + commandName);
     }
 }
diff --git a/OpenRefine/extensions/gdata/pom.xml b/OpenRefine/extensions/gdata/pom.xml
index d457b6a23..e2a46aa47 100644
--- a/OpenRefine/extensions/gdata/pom.xml
+++ b/OpenRefine/extensions/gdata/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-drive</artifactId>
-      <version>v3-rev20211107-1.32.1</version>
+      <version>v3-rev20220110-1.32.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.apis</groupId>
diff --git a/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/GoogleAPIExtensionTest.java b/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/GoogleAPIExtensionTest.java
index d6e2d2aac..99d262305 100644
--- a/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/GoogleAPIExtensionTest.java
+++ b/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/GoogleAPIExtensionTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.gdata;
 
 import com.google.refine.ProjectManager;
@@ -8,30 +9,30 @@ import static org.testng.Assert.*;
 
 public class GoogleAPIExtensionTest {
 
-	@Test
-	public void extractSpreadSheetIdTest() {
-		// GoogleAPIExtension will call ProjectManager.singleton.getPreferenceStore() during class initialization,
-		// which will cause NullPointerException if this line is omitted.
-		ProjectManager.singleton = mock(ProjectManager.class);
+    @Test
+    public void extractSpreadSheetIdTest() {
+        // GoogleAPIExtension will call ProjectManager.singleton.getPreferenceStore() during class initialization,
+        // which will cause NullPointerException if this line is omitted.
+        ProjectManager.singleton = mock(ProjectManager.class);
 
-		String spreadSheetId = "16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0";
+        String spreadSheetId = "16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0";
 
-		String url1 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0/edit#gid=0";
-		assertEquals(GoogleAPIExtension.extractSpreadSheetId(url1), spreadSheetId);
+        String url1 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0/edit#gid=0";
+        assertEquals(GoogleAPIExtension.extractSpreadSheetId(url1), spreadSheetId);
 
-		String url2 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0/";
-		assertEquals(GoogleAPIExtension.extractSpreadSheetId(url2), spreadSheetId);
+        String url2 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0/";
+        assertEquals(GoogleAPIExtension.extractSpreadSheetId(url2), spreadSheetId);
 
-		String url3 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0?foo=bar";
-		assertEquals(GoogleAPIExtension.extractSpreadSheetId(url3), spreadSheetId);
+        String url3 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0?foo=bar";
+        assertEquals(GoogleAPIExtension.extractSpreadSheetId(url3), spreadSheetId);
 
-		String url4 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0/?foo=bar";
-		assertEquals(GoogleAPIExtension.extractSpreadSheetId(url4), spreadSheetId);
+        String url4 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0/?foo=bar";
+        assertEquals(GoogleAPIExtension.extractSpreadSheetId(url4), spreadSheetId);
 
-		String url5 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0#foo";
-		assertEquals(GoogleAPIExtension.extractSpreadSheetId(url5), spreadSheetId);
+        String url5 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0#foo";
+        assertEquals(GoogleAPIExtension.extractSpreadSheetId(url5), spreadSheetId);
 
-		String url6 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0";
-		assertEquals(GoogleAPIExtension.extractSpreadSheetId(url6), spreadSheetId);
-	}
+        String url6 = "https://docs.google.com/spreadsheets/d/16L0JfpBWPfBJTqKtm-YU5-UBWLpkwXII-IRLMLnoKw0";
+        assertEquals(GoogleAPIExtension.extractSpreadSheetId(url6), spreadSheetId);
+    }
 }
diff --git a/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/SpreadsheetSerializerTests.java b/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/SpreadsheetSerializerTests.java
index 2814f2e4d..aed2c9b7b 100644
--- a/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/SpreadsheetSerializerTests.java
+++ b/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/SpreadsheetSerializerTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.gdata;
 
 import static org.mockito.Mockito.mock;
diff --git a/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/UploadCommandTest.java b/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/UploadCommandTest.java
index 9ccb9ccad..2dc61c6d0 100644
--- a/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/UploadCommandTest.java
+++ b/OpenRefine/extensions/gdata/tests/src/com/google/refine/extension/gdata/UploadCommandTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.extension.gdata;
 
 import static org.mockito.Mockito.mock;
@@ -20,7 +21,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.commands.Command;
 import com.google.refine.util.ParsingUtilities;
 
-
 class UploadCommandStub extends UploadCommand {
 
     public byte[] getIcon() throws IOException {
@@ -29,33 +29,34 @@ class UploadCommandStub extends UploadCommand {
 }
 
 public class UploadCommandTest {
+
     protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
     protected Command command = null;
     protected StringWriter writer = null;
 
-
-	@BeforeMethod
-	public void setUpRequestResponse() {
-		request = mock(HttpServletRequest.class);
-		response = mock(HttpServletResponse.class);
-		writer = new StringWriter();
-		command = new UploadCommand();
-		try {
+    @BeforeMethod
+    public void setUpRequestResponse() {
+        request = mock(HttpServletRequest.class);
+        response = mock(HttpServletResponse.class);
+        writer = new StringWriter();
+        command = new UploadCommand();
+        try {
             when(response.getWriter()).thenReturn(new PrintWriter(writer));
         } catch (IOException e) {
             e.printStackTrace();
         }
-	}
-	
-	@Test
-	public void testCsrfProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		Assert.assertEquals(
-				ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", ObjectNode.class),
-				ParsingUtilities.mapper.readValue(writer.toString(), ObjectNode.class));
+    }
 
-	}
+    @Test
+    public void testCsrfProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        Assert.assertEquals(
+                ParsingUtilities.mapper.readValue("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}",
+                        ObjectNode.class),
+                ParsingUtilities.mapper.readValue(writer.toString(), ObjectNode.class));
+
+    }
 
     @Test
     public void testIconRead() throws IOException {
diff --git a/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonAttributeTest.java b/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonAttributeTest.java
index c97a071fc..478a06a68 100644
--- a/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonAttributeTest.java
+++ b/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonAttributeTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.jython;
 
 import java.util.Properties;
@@ -11,7 +12,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Row;
 
 public class JythonAttributeTest {
-    
+
     class MyFieldObject implements HasFields {
 
         @Override
@@ -26,25 +27,25 @@ public class JythonAttributeTest {
         public boolean fieldAlsoHasFields(String name) {
             return true;
         }
-        
+
     }
-    
+
     @Test
     public void testWrappedObjectsHaveAttributes() {
         Row row = new Row(2);
         row.setCell(0, new Cell("sunshine", null));
         row.setCell(1, new Cell("hammock", null));
-        
+
         Properties props = new Properties();
-        
+
         MyFieldObject obj = new MyFieldObject();
         JythonHasFieldsWrapper wrapper = new JythonHasFieldsWrapper(obj, props);
         Assert.assertEquals(wrapper.__findattr__("sunshine").toString(), "hammock");
-        
+
         props.put("cell", obj);
 
         Evaluable eval = new JythonEvaluable("return cell.sunshine");
-        String result = (String)eval.evaluate(props).toString();
+        String result = (String) eval.evaluate(props).toString();
         Assert.assertEquals(result, "hammock");
     }
 }
diff --git a/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java b/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java
index b23e2c38d..5c0a29705 100644
--- a/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java
+++ b/OpenRefine/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.jython;
 
 import java.io.File;
@@ -21,62 +22,62 @@ import com.google.refine.model.Row;
  */
 public class JythonEvaluableTest {
 
-  // Reproduces the situation when result is a PyObject
-  // Version with a test case which only calls the existing evaluate method
-  @Test
-  public void unwrapPyObjectTest(){
-    Properties props = new Properties();
-    Project project = new Project();
+    // Reproduces the situation when result is a PyObject
+    // Version with a test case which only calls the existing evaluate method
+    @Test
+    public void unwrapPyObjectTest() {
+        Properties props = new Properties();
+        Project project = new Project();
 
-    Row row = new Row(2);
-    row.setCell(0, new Cell("one", null));
-    row.setCell(0, new Cell("1", null));
+        Row row = new Row(2);
+        row.setCell(0, new Cell("one", null));
+        row.setCell(0, new Cell("1", null));
 
-    props.put("columnName", "number");
-    props.put("true", "true");
-    props.put("false", "false");
-    props.put("rowIndex", "0");
-    props.put("value", 1);
-    props.put("project", project);
-    props.put("call", "number");
-    props.put("PI", "3.141592654");
-    props.put("cells", new CellTuple(project, row));
-    String funcExpression ="class Foo(object):\n" +
-            "    bar = 1\n" +
-            "\n" +
-            "return Foo()";
-    JythonEvaluable eval1 = new JythonEvaluable(funcExpression);
-    PyObject po = (PyObject) eval1.evaluate(props);
-    Assert.assertEquals(po.__getattr__("bar").toString(),"1");
-  }
+        props.put("columnName", "number");
+        props.put("true", "true");
+        props.put("false", "false");
+        props.put("rowIndex", "0");
+        props.put("value", 1);
+        props.put("project", project);
+        props.put("call", "number");
+        props.put("PI", "3.141592654");
+        props.put("cells", new CellTuple(project, row));
+        String funcExpression = "class Foo(object):\n" +
+                "    bar = 1\n" +
+                "\n" +
+                "return Foo()";
+        JythonEvaluable eval1 = new JythonEvaluable(funcExpression);
+        PyObject po = (PyObject) eval1.evaluate(props);
+        Assert.assertEquals(po.__getattr__("bar").toString(), "1");
+    }
 
-  @Test
-  public void testJythonConcurrent(){
-    Properties props = new Properties();
-    Project project = new Project();
+    @Test
+    public void testJythonConcurrent() {
+        Properties props = new Properties();
+        Project project = new Project();
 
-    Row row = new Row(2);
-    row.setCell(0, new Cell("one", null));
-    row.setCell(0, new Cell("1", null));
+        Row row = new Row(2);
+        row.setCell(0, new Cell("one", null));
+        row.setCell(0, new Cell("1", null));
 
-    props.put("columnName", "number");
-    props.put("true", "true");
-    props.put("false", "false");
-    props.put("rowIndex", "0");
-    props.put("value", 1);
-    props.put("project", project);
-    props.put("call", "number");
-    props.put("PI", "3.141592654");
-    props.put("cells", new CellTuple(project, row));
+        props.put("columnName", "number");
+        props.put("true", "true");
+        props.put("false", "false");
+        props.put("rowIndex", "0");
+        props.put("value", 1);
+        props.put("project", project);
+        props.put("call", "number");
+        props.put("PI", "3.141592654");
+        props.put("cells", new CellTuple(project, row));
 
-    Evaluable eval1 = new JythonEvaluable("a = value\nreturn a * 2");
-    Long value1 = (Long) eval1.evaluate(props);
+        Evaluable eval1 = new JythonEvaluable("a = value\nreturn a * 2");
+        Long value1 = (Long) eval1.evaluate(props);
 
-    // create some unrelated evaluable
-    new JythonEvaluable("a = value\nreturn a * 10");
+        // create some unrelated evaluable
+        new JythonEvaluable("a = value\nreturn a * 10");
 
-    // repeat same previous test
-    Long value2 = (Long) eval1.evaluate(props);
-    Assert.assertEquals(value1, value2);
-  }
+        // repeat same previous test
+        Long value2 = (Long) eval1.evaluate(props);
+        Assert.assertEquals(value1, value2);
+    }
 }
diff --git a/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java b/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java
index a0e03633e..adca635f8 100644
--- a/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java
+++ b/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.phonetic.keyers;
 
 import static org.testng.Assert.assertEquals;
@@ -6,20 +7,20 @@ import org.testng.annotations.Test;
 
 import com.google.refine.clustering.binning.Keyer;
 
-public class BeiderMorseKeyerTest  {
-    
+public class BeiderMorseKeyerTest {
+
     Keyer keyer = new BeiderMorseKeyer();
-    
+
     @Test
     public void testKey() {
         assertEquals(keyer.key("Alphonse"), "YlfYnzi");
     }
-    
+
     @Test
     public void testAccents() {
         assertEquals(keyer.key("Éléonore"), "ilionor");
     }
-    
+
     @Test
     public void testEmpty() {
         assertEquals(keyer.key(""), "");
diff --git a/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java b/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java
index d949692cc..50129ff1b 100644
--- a/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java
+++ b/OpenRefine/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.phonetic.keyers;
 
 import static org.testng.Assert.assertEquals;
@@ -7,19 +8,19 @@ import org.testng.annotations.Test;
 import com.google.refine.clustering.binning.Keyer;
 
 public class DaitchMokotoffKeyerTest {
+
     protected Keyer keyer = new DaitchMokotoffKeyer();
-    
+
     @Test
     public void testDaitchMokotoff() {
         assertEquals(keyer.key("Alphonse"), "087640");
     }
-    
+
     @Test
     public void testAccents() {
         assertEquals(keyer.key("Éléonore"), "086900");
     }
-    
-    
+
     @Test
     public void testEmpty() {
         assertEquals(keyer.key(""), "000000");
diff --git a/OpenRefine/extensions/sample/pom.xml b/OpenRefine/extensions/sample/pom.xml
index 78b26cfa7..2b9543688 100644
--- a/OpenRefine/extensions/sample/pom.xml
+++ b/OpenRefine/extensions/sample/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.openrefine</groupId>
   <artifactId>sample</artifactId>
   <packaging>jar</packaging>
-  <version>3.0-SNAPSHOT</version>
+  <version>3.6-SNAPSHOT</version>
 
   <name>OpenRefine - Sample extension</name>
   <description>Example extension provided for demonstration purposes</description>
diff --git a/OpenRefine/extensions/wikidata/module/MOD-INF/controller.js b/OpenRefine/extensions/wikidata/module/MOD-INF/controller.js
index 59a78e599..10fd0b50c 100644
--- a/OpenRefine/extensions/wikidata/module/MOD-INF/controller.js
+++ b/OpenRefine/extensions/wikidata/module/MOD-INF/controller.js
@@ -58,12 +58,14 @@ function init() {
         "scripts/ajv.min.js",
         "scripts/wikidata-manifest-v1.0.js",
         "scripts/wikibase-manifest-schema-v1.js",
+        "scripts/wikibase-manifest-schema-v2.js",
         "scripts/wikibase-manager.js",
         "scripts/menu-bar-extension.js",
         "scripts/warningsrenderer.js",
         "scripts/langsuggest.js",
         "scripts/bettersuggest.js",
         "scripts/previewrenderer.js",
+        "scripts/wikibase-suggest.js",
         "scripts/schema-alignment.js",
         "scripts/wikidata-extension-manager.js",
         "scripts/dialogs/manage-account-dialog.js",
diff --git a/OpenRefine/extensions/wikidata/module/langs/translation-en.json b/OpenRefine/extensions/wikidata/module/langs/translation-en.json
index 2b5700d2d..d841e8bd8 100644
--- a/OpenRefine/extensions/wikidata/module/langs/translation-en.json
+++ b/OpenRefine/extensions/wikidata/module/langs/translation-en.json
@@ -27,7 +27,7 @@
     "wikibase-addition/cancel": "Cancel",
     "wikibase-addition/invalid-manifest": "Invalid Wikibase manifest.",
     "wikibase-schema/dialog-header": "Align to Wikibase",
-    "wikibase-schema/dialog-explanation": "You are currently working against <a href=\"$1\" target=\"_blank\">$2</a>. You should have your data reconciled to reconciliation services linked to $2 (such as <a href=\"$3\" target=\"_blank\">$3</a>) first. The schema below specifies how your tabular data will be transformed into $2 edits. You can drag and drop the column names below in most input boxes: for each row, edits will be generated with the values in these columns.",
+    "wikibase-schema/dialog-explanation": "You are currently working against <a href=\"$1\" target=\"_blank\">$2</a>. You should have your data reconciled to reconciliation services linked to $2 first. The schema below specifies how your tabular data will be transformed into $2 edits. You can drag and drop the column names below in most input boxes: for each row, edits will be generated with the values in these columns.",
     "wikibase-schema/preview-explanation": "This tab shows the first edits (out of $1) that will be made once you upload the changes to <a href=\"$2\" target=\"_blank\">$3</a>. You can use facets to inspect the edits on particular items.",
     "wikibase-schema/schema-tab-header": "Schema",
     "wikibase-schema/warnings-tab-header": "Issues",
@@ -58,7 +58,7 @@
     "wikibase-schema/description-override": "Description (override if present)",
     "wikibase-schema/override-term": "override if present",
     "wikibase-schema/alias": "Alias",
-    "wikibase-schema/item-or-reconciled-column": "type item or drag reconciled column here",
+    "wikibase-schema/entity-or-reconciled-column": "type entity or drag reconciled column here",
     "wikibase-schema/amount": "amount",
     "wikibase-schema/unit": "unit",
     "wikibase-schema/full-url": "full URL including the protocol",
@@ -77,6 +77,7 @@
     "wikibase-schema/discard-schema-changes-alt": "Discard the changes made to the schema.",
     "wikibase-schema/incomplete-schema-could-not-be-saved": "Your schema is incomplete so it cannot be saved yet.",
     "wikibase-schema/unsaved-warning": "You have made unsaved changes to your Wikibase schema. Close anyway?",
+    "wikibase-schema/incompatible-site-iri-reconciled-column": "This column is reconciled to the identifier space $1, but this input requires a column reconciled to $2.",
     "wikibase-preview/new-id": "new item",
     "wikibase-account/dialog-header": "$1 account",
     "wikibase-account/explain-log-in": "Logging in to <a href=\"$1\" target=\"_blank\">$2</a> lets you to upload edits directly from OpenRefine.",
@@ -192,7 +193,7 @@
     "warnings-messages/non-printable-characters/title": "Non-printable characters in strings.",
     "warnings-messages/non-printable-characters/body": "Strings such as <span class=\"wb-issue-preformat\">{example_string}</span> contain non-printable characters.",
     "warnings-messages/invalid-identifier-space/title": "Invalid identifier space for reconciled cells.",
-    "warnings-messages/invalid-identifier-space/body": "Some reconciled cells such as <span class=\"wb-issue-preformat\">{example_cell}</span> were ignored because they are not reconciled to {wikibase_name}.",
+    "warnings-messages/invalid-identifier-space/body": "Some reconciled cells such as <span class=\"wb-issue-preformat\">{example_cell}</span> were ignored because they are not reconciled to <span class=\"wb-issue-preformat\">{expected_site_iri}</span>.",
     "warnings-messages/ignored-language/title": "Invalid language identifiers.",
     "warnings-messages/ignored-language/body": "Some language identifiers are invalid, such as <span class=\"wb-issue-preformat\">{example_value}</span>. See the <a href=\"https://www.wikidata.org/wiki/Wikidata:Tools/OpenRefine/Editing/Schema_alignment#Languages\" target=\"_blank\">allowed values</a>.",
     "warnings-messages/ignored-date/title": "Invalid date formats.",
diff --git a/OpenRefine/extensions/wikidata/module/langs/translation-fr.json b/OpenRefine/extensions/wikidata/module/langs/translation-fr.json
index ca1a0d3e9..c9b2aa626 100644
--- a/OpenRefine/extensions/wikidata/module/langs/translation-fr.json
+++ b/OpenRefine/extensions/wikidata/module/langs/translation-fr.json
@@ -6,7 +6,7 @@
     "wikibase-extension/export-to-qs": "Exporter vers QuickStatements",
     "wikibase-extension/quickstatements-export-name": "QuickStatements",
     "wikibase-schema/dialog-header": "Aligner sur la Wikibase",
-    "wikibase-schema/dialog-explanation": "Vous travaillez actuellement contre <a href=\"$1\" target=\"_blank\">$2</a>. D'abord, vous devriez réconcilier vos données avec les services de réconciliation associés à $2 (tels que <a href=\"$3\" target=\"_blank\">$3</a>). Le schéma ci-dessous spécifie comment vos données tabulaires seront transformées en $2 modifications. Vous pouvez glisser-déposer les noms des colonnes ci-dessous dans la plupart des champs de saisie : pour chaque ligne, des modifications seront générées avec les valeurs dans ces colonnes.",
+    "wikibase-schema/dialog-explanation": "Vous travaillez actuellement contre <a href=\"$1\" target=\"_blank\">$2</a>. D'abord, vous devriez réconcilier vos données avec les services de réconciliation associés à $2. Le schéma ci-dessous spécifie comment vos données tabulaires seront transformées en $2 modifications. Vous pouvez glisser-déposer les noms des colonnes ci-dessous dans la plupart des champs de saisie : pour chaque ligne, des modifications seront générées avec les valeurs dans ces colonnes.",
     "wikibase-schema/preview-explanation": "Cet onglet affiche les premières modifications (sur $1) qui seront effectuées une fois que vous aurez importé les modifications dans <a href=\"$2\" target=\"_blank\">$3</a>. Vous pouvez utiliser des facettes pour inspecter les modifications sur des éléments particuliers.",
     "wikibase-schema/schema-tab-header": "Schéma",
     "wikibase-schema/warnings-tab-header": "Problèmes",
diff --git a/OpenRefine/extensions/wikidata/module/langs/translation-nl.json b/OpenRefine/extensions/wikidata/module/langs/translation-nl.json
index 55ab0b283..fec82c178 100644
--- a/OpenRefine/extensions/wikidata/module/langs/translation-nl.json
+++ b/OpenRefine/extensions/wikidata/module/langs/translation-nl.json
@@ -85,5 +85,11 @@
     "warnings-messages/property-found-in-qualifier/body": "U heeft {property_entity} als kwalificatie gebruikt, maar deze is daar niet voor ontworpen.",
     "warnings-messages/property-found-in-reference/title": "{property_entity} gebruikt als bron.",
     "warnings-messages/property-found-in-reference/body": "U heeft {property_entity} gebruikt als bron, maar deze is daar niet voor ontworpen.",
-    "warnings-messages/missing-mandatory-qualifiers/title": "{statement_property_entity} mist een {missing_property_entity}-kwalificatie."
+    "warnings-messages/missing-mandatory-qualifiers/title": "{statement_property_entity} mist een {missing_property_entity}-kwalificatie.",
+    "wikibase-extension/qs-file": "QuickStatements-bestand",
+    "wikibase-extension/wikibase-schema": "Wikibase schema",
+    "wikibase-extension/select-wikibase-instance": "Selecteer Wikibase instance",
+    "wikibase-extension/wikibase-edits": "Wikibase bewerkingen…",
+    "wikibase-extension/export-wikibase-schema": "Wikibase schema exporteren",
+    "wikibase-management/dialog-header": "Selecteer Wikibase instance"
 }
diff --git a/OpenRefine/extensions/wikidata/module/scripts/dialogs/wikibase-dialog.js b/OpenRefine/extensions/wikidata/module/scripts/dialogs/wikibase-dialog.js
index 471c7ba63..a9468b77f 100644
--- a/OpenRefine/extensions/wikidata/module/scripts/dialogs/wikibase-dialog.js
+++ b/OpenRefine/extensions/wikidata/module/scripts/dialogs/wikibase-dialog.js
@@ -36,12 +36,12 @@ WikibaseDialog.populateDialog = function () {
         if (wikibaseName.toLowerCase() === WikibaseManager.getSelectedWikibaseName().toLowerCase()) {
           item += "<td><a class=\"wikibase-dialog-selector-remove wikibase-selected\" onclick=\"void(0)\"></a></td>";
         } else {
-	      item += "<td><a class=\"wikibase-dialog-selector-remove\" onclick=\"WikibaseDialog.removeWikibase(event, '" + wikibaseName + "')\"></a></td>";
+          item += "<td><a class=\"wikibase-dialog-selector-remove\" onclick=\"WikibaseDialog.removeWikibase(event, '" + wikibaseName + "')\"></a></td>";
         }
         item += "</tr>";
         WikibaseDialog.elmts.wikibaseList.append(item);
       }
-	}, wikibaseName);
+    }, wikibaseName);
   }
 };
 
@@ -86,9 +86,14 @@ WikibaseDialog.addWikibaseManifest = function () {
       }
 
       WikibaseManager.addWikibase(manifest);
-      let lang = $.i18n('core-recon/wd-recon-lang');
-      let reconEndpoint = manifest.reconciliation.endpoint.replace("${lang}", lang);
-      ReconciliationManager.getOrRegisterServiceFromUrl(reconEndpoint, function () {}, true);
+
+      // pre-register reconciliation services mentioned by this manifest
+      for (let reconEndpoint of WikibaseManager.getReconciliationEndpoints(manifest)) {
+        let lang = $.i18n('core-recon/wd-recon-lang');
+        let endpoint = reconEndpoint.replace("${lang}", lang);
+        ReconciliationManager.getOrRegisterServiceFromUrl(endpoint, function () {}, true);
+      }
+
       DialogSystem.dismissUntil(level - 1);
       WikibaseDialog.populateDialog();
     };
@@ -113,15 +118,28 @@ WikibaseDialog.validateManifest = function (manifest) {
   if (!WikibaseDialog.ajv) {
     WikibaseDialog.ajv = new Ajv();
     WikibaseDialog.validateWikibaseManifestV1 = WikibaseDialog.ajv.compile(WikibaseManifestSchemaV1);
+    WikibaseDialog.validateWikibaseManifestV2 = WikibaseDialog.ajv.compile(WikibaseManifestSchemaV2);
   }
 
-  if (WikibaseDialog.validateWikibaseManifestV1(manifest)) {
-    return true;
+  if (manifest.version !== undefined && manifest.version.startsWith('1.')) {
+    if (WikibaseDialog.validateWikibaseManifestV1(manifest)) {
+       return true;
+    } else {
+      let errMsg = WikibaseDialog.ajv.errorsText(WikibaseDialog.validateWikibaseManifestV1.errors, {
+        dataVar: "manifest"
+      });
+      alert(errMsg);
+      return false;
+    }
   } else {
-    let errMsg = WikibaseDialog.ajv.errorsText(WikibaseDialog.validateWikibaseManifestV1.errors, {
-      dataVar: "manifest"
-    });
-    alert(errMsg);
-    return false;
+    if (WikibaseDialog.validateWikibaseManifestV2(manifest)) {
+      return true;
+    } else {
+      let errMsg = WikibaseDialog.ajv.errorsText(WikibaseDialog.validateWikibaseManifestV2.errors, {
+        dataVar: "manifest"
+      });
+      alert(errMsg);
+      return false;
+    }
   }
 };
diff --git a/OpenRefine/extensions/wikidata/module/scripts/schema-alignment.js b/OpenRefine/extensions/wikidata/module/scripts/schema-alignment.js
index a6faeb9b6..6e30359df 100644
--- a/OpenRefine/extensions/wikidata/module/scripts/schema-alignment.js
+++ b/OpenRefine/extensions/wikidata/module/scripts/schema-alignment.js
@@ -121,8 +121,7 @@ SchemaAlignment._rerenderTabs = function() {
   var schemaElmts = this._schemaElmts = DOM.bind(schemaTab);
   schemaElmts.dialogExplanation.html($.i18n('wikibase-schema/dialog-explanation',
       WikibaseManager.getSelectedWikibaseMainPage(),
-      WikibaseManager.getSelectedWikibaseName(),
-      WikibaseManager.getSelectedWikibaseReconEndpoint().replace("${lang}", "en")));
+      WikibaseManager.getSelectedWikibaseName()));
   this._plusButton($.i18n('wikibase-schema/add-item-button'), schemaElmts.addItemButton);
   schemaElmts.addItemButton.click(function(e) {
     SchemaAlignment._addItem();
@@ -162,17 +161,24 @@ SchemaAlignment._rerenderTabs = function() {
   previewElmts.invalidSchemaWarningPreview.text($.i18n('wikibase-schema/invalid-schema-warning-preview'));
   this._previewPanes = $(".schema-alignment-dialog-preview");
 
-  var reconServiceURL = WikibaseManager.getSelectedWikibaseReconEndpoint()
-      .replace("${lang}", $.i18n("core-recon/wd-recon-lang"));
-  ReconciliationManager.getOrRegisterServiceFromUrl(reconServiceURL, function (service)  {
-    SchemaAlignment._reconService = service;
+  // add all recon services for all the entity types of the Wikibase instance
+  var entityTypes = WikibaseManager.getSelectedWikibaseAvailableEntityTypes();
+  SchemaAlignment._reconService = {};
+  for (let entityType of entityTypes) {
+    var reconServiceTemplate = WikibaseManager.getSelectedWikibaseReconEndpoint(entityType);
+    if (reconServiceTemplate != null) {
+      var reconServiceURL = reconServiceTemplate.replace("${lang}", $.i18n("core-recon/wd-recon-lang"));
+      ReconciliationManager.getOrRegisterServiceFromUrl(reconServiceURL, function (service)  {
+        SchemaAlignment._reconService[entityType] = service;
+      }, false);
+    }
+  }
 
-    // Load the existing schema
-    SchemaAlignment._reset(theProject.overlayModels.wikibaseSchema);
+  // Load the existing schema
+  SchemaAlignment._reset(theProject.overlayModels.wikibaseSchema);
 
-    // Perform initial preview
-    SchemaAlignment.preview();
-  }, false);
+  // Perform initial preview
+  SchemaAlignment.preview();
 };
 
 SchemaAlignment.onWikibaseChange = function() {
@@ -190,9 +196,11 @@ SchemaAlignment.updateColumns = function() {
   for (var i = 0; i < columns.length; i++) {
      var column = columns[i];
      var reconConfig = column.reconConfig;
-     // make sure the column was reconciled to the target Wikibase
+     // make sure the column was reconciled.
+     // TODO we could potentially ignore any reconciliation to a siteIRI not
+     // mentioned in the manifest…
      var cell = SchemaAlignment._createDraggableColumn(column.name,
-        reconConfig && reconConfig.identifierSpace === WikibaseManager.getSelectedWikibaseSiteIri() && column.reconStats);
+        reconConfig && column.reconStats ? reconConfig.identifierSpace : null);
      this._columnArea.append(cell);
   }
 
@@ -327,9 +335,13 @@ SchemaAlignment._changesCleared = function() {
         .addClass('disabled');
 };
 
-SchemaAlignment._createDraggableColumn = function(name, reconciled) {
+SchemaAlignment._createDraggableColumn = function(name, reconciledSiteIRI) {
   var cell = $("<div></div>").addClass('wbs-draggable-column').text(name);
-  if (reconciled) {
+  cell.data({
+        'columnName': name,
+        'reconciledSiteIRI': reconciledSiteIRI
+  });
+  if (reconciledSiteIRI !== null) {
     cell.addClass('wbs-reconciled-column');
   } else {
     cell.addClass('wbs-unreconciled-column');
@@ -380,7 +392,11 @@ SchemaAlignment._addItem = function(json) {
      e.preventDefault();
   });
   var inputContainer = $('<div></div>').addClass('wbs-item-input').appendTo(item);
-  SchemaAlignment._initField(inputContainer, "wikibase-item", subject);
+  // TODO temporary solution to pick another entity type than item
+  // depending on the Wikibase manifest. To be removed in favour of proper support
+  // for multiple entity types per Wikibase
+  let defaultEntityType = WikibaseManager.getSelectedWikibaseDefaultEntityType();
+  SchemaAlignment._initField(inputContainer, "wikibase-"+defaultEntityType, subject);
   var right = $('<div></div>').addClass('wbs-item-contents').appendTo(item);
 
   // Terms
@@ -908,28 +924,29 @@ SchemaAlignment._initPropertyField = function(inputContainer, targetContainer, i
   var input = $('<input></input>').appendTo(inputContainer);
   input.attr("placeholder", $.i18n('wikibase-schema/property-placeholder'));
 
-  if (this._reconService !== null) {
-    var endpoint = this._reconService.suggest.property;
-    var suggestConfig = $.extend({}, endpoint);
-    suggestConfig.key = null;
-    suggestConfig.query_param_name = "prefix";
-
-    input.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
-        // Fetch the type of this property and add the appropriate target value type
-        SchemaAlignment._getPropertyType(data.id, function(datatype) {
-          inputContainer.data("jsonValue", {
-            type : "wbpropconstant",
-            pid : data.id,
-            label: data.name,
-            datatype: datatype,
-          });
-          SchemaAlignment._addStatement(targetContainer, datatype, null);
-          var addValueButtons = targetContainer.parent().find('.wbs-add-statement');
-          var removeGroupButton = targetContainer.parent().find('.wbs-remove-statement-group');
-          removeGroupButton.hide();
-          addValueButtons.show();
+  var endpoint = WikibaseManager.getSelectedWikibaseApiForEntityType('property');
+  var suggestConfig = {
+    mediawiki_endpoint: endpoint,
+    entity_type: 'property',
+    language: $.i18n("core-recon/wd-recon-lang"),
+    view_url: WikibaseManager.getSelectedWikibaseSiteIriForEntityType('property')+'{{id}}'
+  };
+  
+  input.suggestWikibase(suggestConfig).bind("fb-select", function(evt, data) {
+      SchemaAlignment._getPropertyType(data.id, function(datatype) {
+        inputContainer.data("jsonValue", {
+          type : "wbpropconstant",
+          pid : data.id,
+          label: data.name,
+          datatype: datatype,
         });
-        SchemaAlignment._hasChanged();
+        SchemaAlignment._addStatement(targetContainer, datatype, null);
+        var addValueButtons = targetContainer.parent().find('.wbs-add-statement');
+        var removeGroupButton = targetContainer.parent().find('.wbs-remove-statement-group');
+        removeGroupButton.hide();
+        addValueButtons.show();
+      });
+      SchemaAlignment._hasChanged();
     }).bind("fb-textchange", function(evt, data) {
         inputContainer.data("jsonValue", null);
         targetContainer.find('.wbs-statement').remove();
@@ -938,9 +955,8 @@ SchemaAlignment._initPropertyField = function(inputContainer, targetContainer, i
         addValueButtons.hide();
         removeGroupButton.show();
     });
-   // adds tweaks to display the validation status more clearly, like in Wikidata
-   fixSuggestInput(input);
-  }
+  // adds tweaks to display the validation status more clearly, like in Wikidata
+  fixSuggestInput(input);
 
   // Init with the provided initial value.
   if (initialValue) {
@@ -960,52 +976,34 @@ SchemaAlignment._initField = function(inputContainer, mode, initialValue, change
     changedCallback = SchemaAlignment._hasChanged;
   }
 
-  if (this._reconService !== null && (mode === "wikibase-item" || mode === "unit")) {
-    if (mode === "wikibase-item") {
-        input.attr("placeholder", $.i18n('wikibase-schema/item-or-reconciled-column'));
+  // the mode for Wikibase entities has the form "wikibase-{entitytype}", such as "wikibase-item" or "wikibase-property"
+  if (this._reconService !== null && (mode.startsWith("wikibase-") || mode === "unit")) {
+    var entityType = null;
+    if (mode.startsWith("wikibase-")) {
+        input.attr("placeholder", $.i18n('wikibase-schema/entity-or-reconciled-column'));
+	entityType = mode.slice("wikibase-".length);
     } else {
         input.attr("placeholder", $.i18n('wikibase-schema/unit'));
+	entityType = "item";
     }
-    var endpoint = null;
-    endpoint = this._reconService.suggest.entity;
-    var suggestConfig = $.extend({}, endpoint);
-    suggestConfig.key = null;
-    suggestConfig.query_param_name = "prefix";
-    if ('view' in this._reconService && 'url' in this._reconService.view && !('view_url' in endpoint)) {
-       suggestConfig.view_url = this._reconService.view.url;
-    }
-
-
-    input.suggest(suggestConfig).bind("fb-select", function(evt, data) {
+    var endpoint = WikibaseManager.getSelectedWikibaseApiForEntityType(entityType);
+    var suggestConfig = {
+      mediawiki_endpoint: endpoint,
+      entity_type: entityType,
+      language: $.i18n("core-recon/wd-recon-lang"),
+      view_url: WikibaseManager.getSelectedWikibaseSiteIriForEntityType(entityType)+'{{id}'
+    };
+    
+    input.suggestWikibase(suggestConfig).bind("fb-select", function(evt, data) {
         inputContainer.data("jsonValue", {
-            type : "wbitemconstant",
-            qid : data.id,
+            type : "wbentityidvalueconstant",
+            id : data.id,
             label: data.name,
         });
         changedCallback();
     });
     // adds tweaks to display the validation status more clearly, like in Wikidata
     fixSuggestInput(input);
-
-  } else if (this._reconService !== null && mode === "wikibase-property") {
-    var endpoint = null;
-    endpoint = this._reconService.suggest.property;
-    var suggestConfig = $.extend({}, endpoint);
-    suggestConfig.key = null;
-    suggestConfig.query_param_name = "prefix";
-
-    input.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
-        inputContainer.data("jsonValue", {
-            type : "wbpropconstant",
-            pid : data.id,
-            label: data.name,
-            datatype: "not-important",
-        });
-        changedCallback();
-    });
-    // adds tweaks to display the validation status more clearly, like in Wikidata
-    fixSuggestInput(input);
-
   } else if (mode === "time") {
      input.attr("placeholder", "YYYY(-MM(-DD))");
      var propagateValue = function(val) {
@@ -1176,9 +1174,15 @@ SchemaAlignment._initField = function(inputContainer, mode, initialValue, change
   // Make it droppable
   var acceptClass = ".wbs-draggable-column";
   var wbVariableType = "wbstringvariable";
-  if (mode === "wikibase-item" || mode === "unit") {
+  var entityType = null;
+  if (mode.startsWith("wikibase-") || mode === "unit") {
       acceptClass = ".wbs-reconciled-column";
-      wbVariableType = "wbitemvariable";
+      wbVariableType = "wbentityvariable";
+      if (mode === "unit") {
+        entityType = "item";
+      } else {
+        entityType = mode.slice("wikibase-".length);
+      }
   } else if (mode === "time") {
       wbVariableType = "wbdatevariable";
   } else if (mode === "globe-coordinate") {
@@ -1194,6 +1198,16 @@ SchemaAlignment._initField = function(inputContainer, mode, initialValue, change
         accept: acceptClass,
     }).on("drop", function (evt, ui) {
         var column = ui.draggable.clone();
+        if (entityType !== null) {
+          // check that the siteIRI of the reconciled column matches
+          // the expected one.
+          var expectedSiteIRI = WikibaseManager.getSelectedWikibaseSiteIriForEntityType(entityType);
+          var actualSiteIRI = ui.draggable.data('reconciledSiteIRI');
+          if (actualSiteIRI !== expectedSiteIRI) {
+            alert($.i18n('wikibase-schema/incompatible-site-iri-reconciled-column', actualSiteIRI, expectedSiteIRI));
+            return false;
+          }
+        }
         acceptDraggableColumn(column);
         inputContainer.data("jsonValue", {
             type : wbVariableType,
@@ -1210,10 +1224,12 @@ SchemaAlignment._initField = function(inputContainer, mode, initialValue, change
 
   // Init with the provided initial value.
   if (initialValue) {
-     if (initialValue.type === "wbitemconstant" || initialValue.type === "wbpropconstant") {
+     if (initialValue.type === "wbentityidvalueconstant" ||
+        /* item for backwards-compatibility purposes */
+        initialValue.type === "wbitemconstant" || initialValue.type === "wbpropconstant") {
         input.val(initialValue.label);
         input.addClass("wbs-validated-input");
-     } else if (initialValue.type == "wbitemvariable") {
+     } else if (initialValue.type == "wbentityvariable") {
         var cell = SchemaAlignment._createDraggableColumn(initialValue.columnName, true);
         acceptDraggableColumn(cell);
      } else if (initialValue.type === "wbstringconstant" ||
@@ -1279,6 +1295,7 @@ SchemaAlignment.getJSON = function() {
     return {
         itemDocuments: list,
         siteIri: WikibaseManager.getSelectedWikibaseSiteIri(),
+        entityTypeSiteIri: Object.fromEntries(WikibaseManager.getSelectedWikibaseAvailableEntityTypes().map(et => [et, WikibaseManager.getSelectedWikibaseSiteIriForEntityType(et)])),
         mediaWikiApiEndpoint: WikibaseManager.getSelectedWikibaseApi()
     };
   } else {
diff --git a/OpenRefine/extensions/wikidata/module/scripts/wikibase-manager.js b/OpenRefine/extensions/wikidata/module/scripts/wikibase-manager.js
index 4944ac990..35e791d77 100644
--- a/OpenRefine/extensions/wikidata/module/scripts/wikibase-manager.js
+++ b/OpenRefine/extensions/wikidata/module/scripts/wikibase-manager.js
@@ -24,6 +24,18 @@ WikibaseManager.getSelectedWikibaseApi = function () {
   return WikibaseManager.getSelectedWikibase().mediawiki.api;
 };
 
+WikibaseManager.getSelectedWikibaseApiForEntityType = function (entityType) {
+  let manifest = WikibaseManager.getSelectedWikibase();
+  // version 1
+  if (manifest.version.split('.')[0] === '1') {
+    return manifest.wikibase.site_iri;
+  } else { // version 2 or above
+    let record = manifest.entity_types[entityType];
+    let api = record === undefined ? undefined : record.mediawiki_api;
+    return api === undefined ? manifest.mediawiki.api : api;
+  }
+};
+
 WikibaseManager.getSelectedWikibaseName = function () {
   return WikibaseManager.selected;
 };
@@ -47,13 +59,81 @@ WikibaseManager.getSelectedWikibaseEditGroupsURLSchema = function() {
 
 /**
  * Returns the default reconciliation service URL of the Wikibase,
- * such as "https://wikidata.reconci.link/${lang}/api".
+ * for a given entity type, such as "https://wikidata.reconci.link/${lang}/api".
  *
  * Notice that there is a "${lang}" variable in the URL, which should
  * be replaced with the actual language code.
  */
-WikibaseManager.getSelectedWikibaseReconEndpoint = function () {
-  return WikibaseManager.getSelectedWikibase().reconciliation.endpoint;
+WikibaseManager.getSelectedWikibaseReconEndpoint = function (entityType) {
+  let manifest = WikibaseManager.getSelectedWikibase();
+  // version 1
+  if (manifest.version.split('.')[0] === '1') {
+    if (entityType === 'item') {
+      return manifest.reconciliation.endpoint;
+    }
+    return null;
+  } else { // version 2 or above
+    let record = manifest.entity_types[entityType];
+    return record === undefined ? undefined : record.reconciliation_endpoint;
+  }
+};
+
+WikibaseManager.getReconciliationEndpoints = function (manifest) {
+  // version 1
+  if (manifest.version.split('.')[0] === '1') {
+    return [manifest.reconciliation.endpoint];
+  } else { // version 2 or above
+    return Object.keys(manifest.entity_types)
+        .map(k => manifest.entity_types[k].reconciliation_endpoint)
+        .filter(endpoint => endpoint != null);
+  }
+};
+
+
+WikibaseManager.getSelectedWikibaseSiteIriForEntityType = function (entityType) {
+  let manifest = WikibaseManager.getSelectedWikibase();
+  // version 1
+  if (manifest.version.split('.')[0] === '1') {
+    return manifest.wikibase.site_iri;
+  } else { // version 2 or above
+    let record = manifest.entity_types[entityType];
+    return record === undefined ? undefined : record.site_iri;
+  }
+};
+
+
+WikibaseManager.getSelectedWikibaseAvailableEntityTypes = function () {
+  let manifest = WikibaseManager.getSelectedWikibase();
+  // version 1
+  if (manifest.version.split('.')[0] === '1') {
+    return ['item', 'property'];
+  } else { // version 2 or above
+    return Object.keys(manifest.entity_types);
+  }
+};
+
+
+/**
+ * TODO temporary function to be removed once we have proper support
+ * for multiple entity types. This one just guesses which item-like
+ * entity type we should let the user edit, based on the manifest.
+ * - for Wikidata it returns 'item'
+ * - for Commons it returns 'mediainfo'
+ */
+WikibaseManager.getSelectedWikibaseDefaultEntityType = function () {
+  let manifest = WikibaseManager.getSelectedWikibase();
+  // version 1
+  if (manifest.version.split('.')[0] === '1') {
+    return 'item';
+  } else { // version 2 or above
+    for (let entityType of ['item', 'property', 'mediainfo']) {
+      if (manifest.entity_types[entityType] !== undefined &&
+          manifest.entity_types[entityType].site_iri === manifest.wikibase.site_iri) {
+        return entityType;
+      }
+    }
+    return 'item'; // by default, as a fallback
+  }
 };
 
 WikibaseManager.selectWikibase = function (wikibaseName) {
diff --git a/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v1.js b/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v1.js
index 1d81eac3d..571a444ad 100644
--- a/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v1.js
+++ b/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v1.js
@@ -1,6 +1,6 @@
 const WikibaseManifestSchemaV1 = {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "TBD",
+  "$id": "https://openrefine.org/schemas/wikibase-manifest-v1.json",
   "type": "object",
   "description": "The schema validates Wikibase manifests with version 1.x. The manifest contains configurations of basic information (e.g. URL of the main page), extensions (e.g. OAuth extension) or external services (e.g. Reconciliation service) of a Wikibase",
   "properties": {
diff --git a/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v2.js b/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v2.js
new file mode 100644
index 000000000..742a845c6
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/module/scripts/wikibase-manifest-schema-v2.js
@@ -0,0 +1,142 @@
+const WikibaseManifestSchemaV2 = {
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://openrefine.org/schemas/wikibase-manifest-v2.json",
+  "type": "object",
+  "description": "The schema validates Wikibase manifests with version 2.x. The manifest contains configurations of basic information (e.g. URL of the main page), extensions (e.g. OAuth extension) or external services (e.g. Reconciliation service) of a Wikibase",
+  "properties": {
+    "version": {
+      "type": "string",
+      "pattern": "^2\\.[0-9]+$",
+      "description": "The version of the Wikibase manifest, in the format of 2.x"
+    },
+    "mediawiki": {
+      "type": "object",
+      "description": "The configurations of the MediaWiki engine",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the Wikibase, such as 'Wikidata'"
+        },
+        "root": {
+          "type": "string",
+          "format": "url",
+          "pattern": "^.*/$",
+          "description": "The URL of the root of the Wikibase, such as 'https://www.wikidata.org/wiki/'. The trailing slash cannot be omitted"
+        },
+        "main_page": {
+          "type": "string",
+          "format": "url",
+          "description": "The URL of the main page of the Wikibase, such as 'https://www.wikidata.org/wiki/Wikidata:Main_Page'"
+        },
+        "api": {
+          "type": "string",
+          "format": "url",
+          "description": "The MediaWiki API endpoint of the Wikibase, such as 'https://www.wikidata.org/w/api.php'"
+        }
+      },
+      "required": ["name", "root", "main_page", "api"]
+    },
+    "wikibase": {
+      "type": "object",
+      "description": "The configurations of the Wikibase extension",
+      "properties": {
+        "site_iri": {
+          "type": "string",
+          "format": "url",
+          "pattern": "^.*/$",
+          "description": "The IRI of the Wikibase, such as 'http://www.wikidata.org/entity/'. This should match the IRI prefixes used in RDF serialization. Be careful about using 'http' or 'https', because any variation will break comparisons at various places. The trailing slash cannot be omitted"
+        },
+        "maxlag": {
+          "type": "integer",
+          "description": "The default maxlag of this Wikibase. For Wikidata, the default value is 5 (seconds)"
+        },
+        "properties": {
+          "type": "object",
+          "properties": {
+            "instance_of": {
+              "type": "string",
+              "description": "The 'instance of' qid of the Wikibase ('P31' for Wikidata)"
+            },
+            "subclass_of": {
+              "type": "string",
+              "description": "The 'subclass of' qid of the Wikibase ('P279' for Wikidata)"
+            }
+          },
+          "required": ["instance_of", "subclass_of"]
+        },
+        "constraints": {
+          "type": "object",
+          "description": "Constraints related qids and pids, not required since the constraints extension may not be installed",
+          "properties": {
+            "property_constraint_pid": {
+              "type": "string",
+              "description": "The property constraint pid of the Wikibase ('P2302' for Wikidata)"
+            }
+          },
+          "patternProperties": {
+            "^.*$": {
+              "type": "string",
+              "description": "If a pid/qid is missing, constraint checks depending on it will be skipped"
+            }
+          },
+          "required": ["property_constraint_pid"]
+        }
+      },
+      "required": ["site_iri", "maxlag", "properties"]
+    },
+    "oauth": {
+      "type": "object",
+      "description": "The configurations of the OAuth extension. Not required. Configuring this if and only if the OAuth extension is installed",
+      "properties": {
+        "registration_page": {
+          "type": "string",
+          "format": "url",
+          "description": "The url of the OAuth consumer registration page, 'https://meta.wikimedia.org/wiki/Special:OAuthConsumerRegistration/propose' for Wikidata"
+        }
+      },
+      "required": ["registration_page"]
+    },
+    "entity_types": {
+      "type": "object",
+      "description": "The available entity types on this Wikibase, with particular settings for each of them. The keys of this object are strings such as 'item', 'property', 'mediainfo' or 'lexeme'",
+      "patternProperties": {
+        "^.*$": {
+          "type": "object",
+          "description": "The settings for the given entity type.",
+          "properties": {
+            "reconciliation_endpoint": {
+              "type": "string",
+              "format": "url",
+              "pattern": "^.*\\${lang}.*$",
+              "description": "The default reconciliation API endpoint of the Wikibase for this entity type, the endpoint should include the language variable '${lang}', such as 'https://wikidata.reconci.link/${lang}/api'"
+            },
+            "site_iri": {
+              "type": "string",
+              "format": "url",
+              "description": "The RDF prefix in which URIs for entities of this type are minted. If entities of this type are edited locally, this should be the global site_iri of the Wikibase. If those entities are drawn from another Wikibase instance, it should be the site_iri of that instance."
+            },
+            "mediawiki_api": {
+              "type": "string",
+              "format": "url",
+              "description": "The MediaWiki API endpoint of the Wikibase, such as 'https://www.wikidata.org/w/api.php'"
+            }
+          },
+          "required": ["site_iri"]
+        }
+      }
+    },
+    "editgroups": {
+      "type": "object",
+      "description": "The configurations of the EditGroups service of the Wikibase",
+      "properties": {
+        "url_schema": {
+          "type": "string",
+          "pattern": "^.*\\${batch_id}.*$",
+          "description": "The URL schema used in edits summary. This is used for EditGroups to extract the batch id from a batch of edits and for linking to the EditGroups page of the batch. The URL schema must contains the variable '${batch_id}', such as '([[:toollabs:editgroups/b/OR/${batch_id}|details]])' for Wikidata"
+        },
+      },
+      "required": ["url_schema"]
+    }
+  },
+  "required": ["version", "mediawiki", "wikibase", "entity_types"]
+};
diff --git a/OpenRefine/extensions/wikidata/module/scripts/wikibase-suggest.js b/OpenRefine/extensions/wikidata/module/scripts/wikibase-suggest.js
new file mode 100644
index 000000000..01c1d4411
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/module/scripts/wikibase-suggest.js
@@ -0,0 +1,142 @@
+
+/**
+ * Adaptation of the suggest widget to query the Wikibase autocomplete API directly
+ */
+
+(function() {
+
+  /**
+   * Options:
+   * mediawiki_endpoint: url of the MediaWiki API
+   * entity_type: type of entity to suggest (one of form, item, lexeme, property, sense, mediainfo…)
+   * language: language code of the language to search in
+   */
+
+  $.suggest(
+    "suggestWikibase",
+    $.extend(
+      true,
+      {},
+      $.suggest.suggest.prototype,
+      {
+        create_item: function(data, response_data) {
+          var css = this.options.css;
+
+          var li =  $("<li>").addClass(css.item);
+
+          var name = $("<div>")
+          .addClass(css.item_name)
+          .append(
+              $("<label>")
+              .append($.suggest.strongify(data.name || data.guid, response_data.prefix)));
+
+          data.name = name.text(); // this converts html escaped strings like "&amp;" back to "&"
+          if (data.description) {
+             var descriptionSpan = $("<span></span>").text(data.description);
+             name.append(descriptionSpan);
+          }
+
+          li.append(name);
+
+          name.prepend($("<div>").addClass(css.item_type).text(data.id));
+
+          return li;
+        },
+
+        request: function(val, cursor) {
+          var self = this,
+              o = this.options;
+
+          var query = val;
+
+          var entity_type = o.entity_type || 'item';
+
+          var data = {
+            action: 'wbsearchentities',
+            language: o.language,
+            search: query,
+            type: entity_type,
+            format: 'json',
+            origin: '*'
+          };
+
+          if (cursor) {
+            data['continue'] = cursor;
+          }
+
+          var url = o.mediawiki_endpoint + "?" + $.param(data, true);
+          var cached = $.suggest.cache[url];
+          if (cached) {
+            this.response(cached, cursor ? cursor : -1, true);
+            return;
+          }
+
+          clearTimeout(this.request.timeout);
+
+          var ajax_options = {
+            url: o.mediawiki_endpoint,
+            data: data,
+            traditional: true,
+            beforeSend: function(xhr) {
+              var calls = self.input.data("request.count.suggest") || 0;
+              if (!calls) {
+                self.trackEvent(self.name, "start_session");
+              }
+              calls += 1;
+              self.trackEvent(self.name, "request", "count", calls);
+              self.input.data("request.count.suggest", calls);
+            },
+            success: function(data) {
+              $.suggest.cache[url] = data;
+              // translate the results of the MediaWiki API to that of the reconciliation API
+              var translated = {
+                  prefix: val, // keep track of prefix to match up response with input value
+                  result: (data.search || []).map(result => { return {
+                      id: result.id,
+                      name: result.label,
+                      description: result.description};})
+              };
+              self.response(translated, cursor ? cursor : -1);
+            },
+            error: function(xhr) {
+              self.status_error();
+              self.trackEvent(self.name, "request", "error", {
+                url: this.url,
+                response: xhr ? xhr.responseText : ''
+              });
+              self.input.trigger("fb-error", Array.prototype.slice.call(arguments));
+            },
+            complete: function(xhr) {
+              if (xhr) {
+                self.trackEvent(self.name, "request", "tid",
+                xhr.getResponseHeader("X-Metaweb-TID"));
+              }
+            },
+            dataType: "json",
+            cache: true
+          };
+
+          this.request.timeout = setTimeout(function() {
+            $.ajax(ajax_options);
+          }, o.xhr_delay);
+        }
+
+      }));
+
+  $.extend(
+    $.suggest.suggestWikibase, 
+    {
+      defaults: $.extend(
+        true,
+        {},
+        $.suggest.suggest.defaults, {
+          scoring: "schema",
+          css: { pane: "fbs-pane fbs-pane-type" }
+        }
+      )
+    }
+  );
+
+})();
+
+
diff --git a/OpenRefine/extensions/wikidata/pom.xml b/OpenRefine/extensions/wikidata/pom.xml
index df6875ed1..bd651e715 100644
--- a/OpenRefine/extensions/wikidata/pom.xml
+++ b/OpenRefine/extensions/wikidata/pom.xml
@@ -15,8 +15,7 @@
   </parent>
 
   <properties>
-    <powermock.version>2.0.9</powermock.version>
-    <wdtk.version>0.12.1</wdtk.version>
+    <wdtk.version>0.12.1-SNAPSHOT</wdtk.version>
   </properties>
 
   <build>
@@ -78,7 +77,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.wikidata.wdtk</groupId>
+      <groupId>org.openrefine.dependencies.wdtk</groupId>
       <artifactId>wdtk-wikibaseapi</artifactId>
       <version>${wdtk.version}</version>
     </dependency>
@@ -88,12 +87,12 @@
       <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.wikidata.wdtk</groupId>
+      <groupId>org.openrefine.dependencies.wdtk</groupId>
       <artifactId>wdtk-datamodel</artifactId>
       <version>${wdtk.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.wikidata.wdtk</groupId>
+      <groupId>org.openrefine.dependencies.wdtk</groupId>
       <artifactId>wdtk-util</artifactId>
       <version>${wdtk.version}</version>
     </dependency>
@@ -121,17 +120,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-testng</artifactId>
-      <version>${powermock.version}</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
       <scope>test</scope>
-     </dependency>
-     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-     </dependency>
+    </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/ConnectionManager.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/ConnectionManager.java
index 2c681a32a..d403435ae 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/ConnectionManager.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/ConnectionManager.java
@@ -165,7 +165,7 @@ public class ConnectionManager {
     /**
      * For testability.
      */
-    static BasicApiConnection convertToBasicApiConnection(Map<String, Object> map) throws JsonProcessingException {
+    BasicApiConnection convertToBasicApiConnection(Map<String, Object> map) throws JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(map);
         return mapper.readValue(json, BasicApiConnection.class);
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/LoginCommand.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/LoginCommand.java
index 3d30daa00..195e0824c 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/LoginCommand.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/LoginCommand.java
@@ -71,6 +71,8 @@ public class LoginCommand extends Command {
     static final String ACCESS_SECRET = "wb-access-secret";
     
     static final Pattern cookieKeyDisallowedCharacters = Pattern.compile("[^a-zA-Z0-9\\-!#$%&'*+.?\\^_`|~]");
+    
+    protected ConnectionManager manager = null;
 
     @Override
     public void doPost(HttpServletRequest request, HttpServletResponse response)
@@ -80,7 +82,9 @@ public class LoginCommand extends Command {
             return;
         }
 
-        ConnectionManager manager = ConnectionManager.getInstance();
+        if (manager == null) {
+        	manager = ConnectionManager.getInstance();
+        }
 
         String mediawikiApiEndpoint = removeCRLF(request.getParameter(API_ENDPOINT));
         if (isBlank(mediawikiApiEndpoint)) {
@@ -188,7 +192,6 @@ public class LoginCommand extends Command {
             return;
         }
 
-        ConnectionManager manager = ConnectionManager.getInstance();
         Map<String, Object> jsonResponse = new HashMap<>();
         if (manager.isLoggedIn(mediawikiApiEndpoint)) {
             jsonResponse.put("logged_in", manager.isLoggedIn(mediawikiApiEndpoint));
@@ -281,4 +284,8 @@ public class LoginCommand extends Command {
         Matcher matcher = cookieKeyDisallowedCharacters.matcher(key);
         return matcher.replaceAll("-");
     }
+
+	protected void setConnectionManager(ConnectionManager connectionManager) {
+		this.manager = connectionManager;
+	}
 }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommand.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommand.java
index 00138702a..a478b3d59 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommand.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommand.java
@@ -73,7 +73,7 @@ public class PreviewWikibaseSchemaCommand extends Command {
                 try {
                     schema = WikibaseSchema.reconstruct(schemaJson);
                 } catch (IOException e) {
-                    respondError(response, "Wikibase schema could not be parsed.");
+                    respondError(response, "Wikibase schema could not be parsed. Error message: "+e.getMessage());
                     return;
                 }
             } else {
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommand.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommand.java
index 728eeefd2..f92fb16f3 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommand.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommand.java
@@ -71,7 +71,7 @@ public class SaveWikibaseSchemaCommand extends Command {
             // We do not use respondException here because this is an expected
             // exception which happens every time a user tries to save an incomplete
             // schema - the exception should not be logged.
-            respondError(response, "Wikibase schema could not be parsed.");
+            respondError(response, String.format("Wikibase schema could not be parsed: ", e.getMessage()));
         } catch (Exception e) {
             // This is an unexpected exception, so we log it.
             respondException(response, e);
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/EditBatchProcessor.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/EditBatchProcessor.java
index ae60aad70..44ced5e32 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/EditBatchProcessor.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/EditBatchProcessor.java
@@ -25,11 +25,15 @@ package org.openrefine.wikidata.editing;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang.NotImplementedException;
 import org.openrefine.wikidata.schema.entityvalues.ReconEntityIdValue;
 import org.openrefine.wikidata.schema.exceptions.NewItemNotCreatedYetException;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
@@ -37,10 +41,17 @@ import org.openrefine.wikidata.updates.scheduler.WikibaseAPIUpdateScheduler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
+import org.wikidata.wdtk.datamodel.interfaces.AliasUpdate;
 import org.wikidata.wdtk.datamodel.interfaces.EntityDocument;
+import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.ItemDocument;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoDocument;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoUpdate;
 import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
+import org.wikidata.wdtk.datamodel.interfaces.StatementUpdate;
+import org.wikidata.wdtk.datamodel.interfaces.TermUpdate;
 import org.wikidata.wdtk.wikibaseapi.WikibaseDataEditor;
 import org.wikidata.wdtk.wikibaseapi.WikibaseDataFetcher;
 import org.wikidata.wdtk.wikibaseapi.apierrors.MediaWikiApiErrorException;
@@ -149,33 +160,56 @@ public class EditBatchProcessor {
             // New item
             if (update.isNew()) {
                 ReconEntityIdValue newCell = (ReconEntityIdValue) update.getItemId();
-                update = update.normalizeLabelsAndAliases();
+                if (newCell instanceof ItemIdValue) {
+                    update = update.normalizeLabelsAndAliases();
+	                ItemDocument itemDocument = Datamodel.makeItemDocument((ItemIdValue) update.getItemId(),
+	                        update.getLabels().stream().collect(Collectors.toList()),
+	                        update.getDescriptions().stream().collect(Collectors.toList()),
+	                        update.getAliases().stream().collect(Collectors.toList()), update.getAddedStatementGroups(),
+	                        Collections.emptyMap());
 
-                ItemDocument itemDocument = Datamodel.makeItemDocument((ItemIdValue) update.getItemId(),
-                        update.getLabels().stream().collect(Collectors.toList()),
-                        update.getDescriptions().stream().collect(Collectors.toList()),
-                        update.getAliases().stream().collect(Collectors.toList()), update.getAddedStatementGroups(),
-                        Collections.emptyMap());
-
-                ItemDocument createdDoc = editor.createItemDocument(itemDocument, summary, tags);
-                library.setQid(newCell.getReconInternalId(), createdDoc.getEntityId().getId());
+	                ItemDocument createdDoc = editor.createItemDocument(itemDocument, summary, tags);
+	                library.setQid(newCell.getReconInternalId(), createdDoc.getEntityId().getId());
+                } else if (newCell instanceof MediaInfoIdValue) {
+                    update = update.normalizeLabelsAndAliases();
+                    throw new NotImplementedException();
+                }
             } else {
                 // Existing item
-                ItemDocument currentDocument = (ItemDocument) currentDocs.get(update.getItemId().getId());
-                List<MonolingualTextValue> labels = update.getLabels().stream().collect(Collectors.toList());
-                labels.addAll(update.getLabelsIfNew().stream()
-                      .filter(label -> !currentDocument.getLabels().containsKey(label.getLanguageCode())).collect(Collectors.toList()));
-                List<MonolingualTextValue> descriptions = update.getDescriptions().stream().collect(Collectors.toList());
-                descriptions.addAll(update.getDescriptionsIfNew().stream()
-                        .filter(desc -> !currentDocument.getDescriptions().containsKey(desc.getLanguageCode())).collect(Collectors.toList()));
-                editor.updateTermsStatements(currentDocument,
-                		labels,
-                        descriptions,
-                        update.getAliases().stream().collect(Collectors.toList()),
-                        new ArrayList<MonolingualTextValue>(),
-                        update.getAddedStatements().stream().collect(Collectors.toList()),
-                        update.getDeletedStatements().stream().collect(Collectors.toList()),
-                        summary, tags);
+                EntityIdValue newCell = (EntityIdValue) update.getItemId();
+                if (newCell instanceof ItemIdValue) {
+	                ItemDocument currentDocument = (ItemDocument) currentDocs.get(update.getItemId().getId());
+	                List<MonolingualTextValue> labels = update.getLabels().stream().collect(Collectors.toList());
+	                labels.addAll(update.getLabelsIfNew().stream()
+	                      .filter(label -> !currentDocument.getLabels().containsKey(label.getLanguageCode())).collect(Collectors.toList()));
+	                List<MonolingualTextValue> descriptions = update.getDescriptions().stream().collect(Collectors.toList());
+	                descriptions.addAll(update.getDescriptionsIfNew().stream()
+	                        .filter(desc -> !currentDocument.getDescriptions().containsKey(desc.getLanguageCode())).collect(Collectors.toList()));
+	                Set<MonolingualTextValue> aliases = update.getAliases();
+	                Map<String, List<MonolingualTextValue>> aliasesMap = aliases.stream()
+	                        .collect(Collectors.groupingBy(MonolingualTextValue::getLanguageCode));
+	                Map<String, AliasUpdate> aliasMap = aliasesMap.entrySet().stream()
+	                        .collect(Collectors.toMap(Entry::getKey, e -> Datamodel.makeAliasUpdate(e.getValue(), Collections.emptyList())));
+	                editor.editEntityDocument(Datamodel.makeItemUpdate((ItemIdValue) update.getItemId(),
+                            currentDocument.getRevisionId(),
+                            Datamodel.makeTermUpdate(labels, Collections.emptyList()),
+                            Datamodel.makeTermUpdate(descriptions, Collections.emptyList()),
+                            aliasMap,
+                            Datamodel.makeStatementUpdate(update.getAddedStatements(), update.getDeletedStatements(), Collections.emptyList()),
+                            Collections.emptyList(), Collections.emptyList()),
+                            false, summary, tags);
+                } else if (newCell instanceof MediaInfoIdValue) {
+                    MediaInfoDocument currentDocument = (MediaInfoDocument) currentDocs.get(update.getItemId().getId());
+	                List<MonolingualTextValue> labels = update.getLabels().stream().collect(Collectors.toList());
+	                labels.addAll(update.getLabelsIfNew().stream()
+	                      .filter(label -> !currentDocument.getLabels().containsKey(label.getLanguageCode())).collect(Collectors.toList()));
+	                TermUpdate labelUpdate = Datamodel.makeTermUpdate(labels, Collections.emptyList());
+	                StatementUpdate statementUpdate = Datamodel.makeStatementUpdate(update.getAddedStatements(), update.getDeletedStatements(),
+                            Collections.emptyList());
+	                MediaInfoUpdate updatesCollection = Datamodel.makeMediaInfoUpdate((MediaInfoIdValue) update.getItemId(),
+                            currentDocument.getRevisionId(), labelUpdate, statementUpdate);
+	                editor.editEntityDocument(updatesCollection, false, summary, tags);
+                }
             }
         } catch (MediaWikiApiErrorException e) {
             // TODO find a way to report these errors to the user in a nice way
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/ReconEntityRewriter.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/ReconEntityRewriter.java
index b43965a9e..098032288 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/ReconEntityRewriter.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/editing/ReconEntityRewriter.java
@@ -114,7 +114,7 @@ public class ReconEntityRewriter extends DatamodelConverter {
 				return Datamodel.makeMediaInfoIdValue(newId, recon.getRecon().identifierSpace);
 			}
 		}
-		return (MediaInfoIdValue) super.copy((ItemIdValue) value);
+		return super.copy((MediaInfoIdValue) value);
 	}
 	
 	@Override
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/Manifest.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/Manifest.java
index 821e78d40..33e4d1a8e 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/Manifest.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/Manifest.java
@@ -1,24 +1,104 @@
 package org.openrefine.wikidata.manifests;
 
-public interface Manifest {
+import java.util.List;
 
+/**
+ * A configuration object for a Wikibase instance.
+ * The deserialization of this object is versioned, via {@link org.openrefine.wikidata.manifests.ManifestParser}.
+ * 
+ * @author Lu Liu, Antonin Delpeuch
+ *
+ */
+public interface Manifest {
+	
+	public static final String ITEM_TYPE = "item";
+	public static final String PROPERTY_TYPE = "property";
+	public static final String MEDIAINFO_TYPE = "mediainfo";
+
+	/**
+	 * The version of the manifest object, which determines its JSON format.
+	 */
     String getVersion();
 
+    /**
+     * The name of the Wikibase instance, displayed in the UI.
+     */
     String getName();
 
+    /**
+     * The RDF serialization prefix for entities stored in this instance.
+     */
     String getSiteIri();
 
+    /**
+     * The recommended `maxlag` value for edits on this instance.
+     */
     int getMaxlag();
 
+    /**
+     * The property id used to link an entity to the entity represing its type (class).
+     * In Wikidata, this is P31 (instance of)
+     */
     String getInstanceOfPid();
 
+    /**
+     * The property id used to link a class to its superclasses.
+     * In Wikidata, this is P279 (subclass of)
+     */
     String getSubclassOfPid();
 
+    /**
+     * The MediaWiki API endpoint of this Wikibase instance.
+     */
     String getMediaWikiApiEndpoint();
 
+    /**
+     * The reconciliation service for items in this Wikibase instance.
+     * @deprecated use {@link #getReconServiceEndpoint(String)} with "item" as argument
+     */
     String getReconServiceEndpoint();
+    
+    /**
+     * Get the reconciliation service endpoint for a given entity type supported by this Wikibase instance.
+     * @param entityType
+     * @return null if there is no recon service for this entity type.
+     */
+    String getReconServiceEndpoint(String entityType);
+    
+    /**
+     * Get the MediaWiki endpoint of the source Wikibase for the entity type.
+     * This can be different than the MediaWiki endpoint for this Wikibase instance,
+     * when federation is used.
+     * @param entityType
+     * @return null if there is no recon service for this entity type.
+     */
+    String getMediaWikiApiEndpoint(String entityType);
+    
+    /**
+     * Gets the site IRI used for a particular entity type.
+     * - if the entity type is editable on this Wikibase instance, then it should be identical
+     *   to the site IRI for this instance.
+     * - if the entity type is federated from another instance, then it should be the site IRI
+     *   for that instance.
+     * @param entityType
+     * @return null if the entity type is not supported by the Wikibase instance
+     */
+    String getEntityTypeSiteIri(String entityType);
+    
+    /**
+     * The list of all entity types in use on this instance.
+     */
+    List<String> getAvailableEntityTypes();
 
+    /**
+     * Returns an item or property id used in the WikibaseQualityConstraints extension.
+     * @param name our internal identifier for the entity id
+     * @return the entity id
+     */
     String getConstraintsRelatedId(String name);
 
+    /**
+     * Returns the template that should be inserted in edit summaries for edits to be tracked by EditGroups.
+     */
     String getEditGroupsUrlSchema();
 }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestParser.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestParser.java
index 22208ac28..34743c2cc 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestParser.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestParser.java
@@ -3,6 +3,9 @@ package org.openrefine.wikidata.manifests;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,6 +36,12 @@ public final class ManifestParser {
         // support only v1.x for now
         if ("1".equals(majorVersion)) {
             return new ManifestV1(root);
+        } else if ("2".equals(majorVersion)) {
+        	try {
+				return new ManifestV2(root);
+			} catch (IOException e) {
+				throw new ManifestException("invalid manifest format: " + e.getMessage());
+			}
         } else {
             throw new ManifestException("unsupported manifest version: " + version);
         }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestV1.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestV1.java
index e3f1171b1..2a0622f0c 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestV1.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/manifests/ManifestV1.java
@@ -1,12 +1,14 @@
 package org.openrefine.wikidata.manifests;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
-import org.wikidata.wdtk.wikibaseapi.ApiConnection;
+import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
+
+import com.fasterxml.jackson.databind.JsonNode;
 
 public class ManifestV1 implements Manifest {
 
@@ -102,4 +104,30 @@ public class ManifestV1 implements Manifest {
         return editGroupsUrlSchema;
     }
 
+	@Override
+	public String getReconServiceEndpoint(String entityType) {
+		if (ITEM_TYPE.equals(entityType)) {
+			return reconServiceEndpoint;
+		}
+		return null;
+	}
+
+	@Override
+	public String getEntityTypeSiteIri(String entityType) {
+		if (ITEM_TYPE.equals(entityType) || PROPERTY_TYPE.equals(entityType)) {
+			return siteIri;
+		}
+		return null;
+	}
+	
+	@Override
+	public String getMediaWikiApiEndpoint(String entityType) {
+		return getMediaWikiApiEndpoint();
+	}
+
+	@Override
+	public List<String> getAvailableEntityTypes() {
+		return Arrays.asList(ITEM_TYPE, PROPERTY_TYPE);
+	}
+
 }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/ExpressionContext.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/ExpressionContext.java
index 126be9866..3fea75010 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/ExpressionContext.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/ExpressionContext.java
@@ -23,6 +23,8 @@
  ******************************************************************************/
 package org.openrefine.wikidata.schema;
 
+import java.util.Map;
+
 import org.apache.commons.lang.Validate;
 import org.openrefine.wikidata.qa.QAWarning;
 import org.openrefine.wikidata.qa.QAWarningStore;
@@ -42,6 +44,7 @@ import com.google.refine.model.Row;
 public class ExpressionContext {
 
     private String baseIRI;
+    private Map<String, String> entityTypeIRIs;
     private String mediaWikiApiEndpoint;
     private int rowId;
     private Row row;
@@ -53,6 +56,8 @@ public class ExpressionContext {
      * 
      * @param baseIRI
      *            the siteIRI of the schema
+     * @param entityTypeBaseIRIS
+     *            the siteIRI for specific entity types, falling back on the baseIRI otherwise
      * @param mediaWikiApiEndpoint
      *            the MediaWiki API endpoint of the Wikibase
      * @param rowId
@@ -65,9 +70,17 @@ public class ExpressionContext {
      *            where to store the issues encountered when evaluating (can be set
      *            to null if these issues should be ignored)
      */
-    public ExpressionContext(String baseIRI, String mediaWikiApiEndpoint, int rowId, Row row, ColumnModel columnModel, QAWarningStore warningStore) {
+    public ExpressionContext(
+    		String baseIRI,
+    		Map<String, String> entityTypeBaseIRIs,
+    		String mediaWikiApiEndpoint,
+    		int rowId,
+    		Row row,
+    		ColumnModel columnModel,
+    		QAWarningStore warningStore) {
         Validate.notNull(baseIRI);
         this.baseIRI = baseIRI;
+        this.entityTypeIRIs = entityTypeBaseIRIs;
         this.mediaWikiApiEndpoint = mediaWikiApiEndpoint;
         this.rowId = rowId;
         Validate.notNull(row);
@@ -80,6 +93,10 @@ public class ExpressionContext {
     public String getBaseIRI() {
         return baseIRI;
     }
+    
+    public String getBaseIRIForEntityType(String entityType) {
+    	return entityTypeIRIs.getOrDefault(entityType, baseIRI);
+    }
 
     public String getMediaWikiApiEndpoint() {
         return mediaWikiApiEndpoint;
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbEntityVariable.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbEntityVariable.java
index a2de3085e..9dc8df3f3 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbEntityVariable.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbEntityVariable.java
@@ -66,23 +66,33 @@ public class WbEntityVariable extends WbVariableExpr<EntityIdValue> {
             throws SkipSchemaExpressionException {
         if (cell.recon != null
                 && (Judgment.Matched.equals(cell.recon.judgment) || Judgment.New.equals(cell.recon.judgment))) {
-            if (cell.recon.identifierSpace == null || !cell.recon.identifierSpace.equals(ctxt.getBaseIRI())) {
-                QAWarning warning = new QAWarning("invalid-identifier-space", null, QAWarning.Severity.INFO, 1);
-                warning.setProperty("example_cell", cell.value.toString());
-                ctxt.addWarning(warning);
-                throw new SkipSchemaExpressionException();
-            }
             if (Judgment.New.equals(cell.recon.judgment)) {
                 return new ReconItemIdValue(cell.recon, cell.value.toString());
             }
             EntityIdValue entityIdValue = EntityIdValueImpl.fromId(cell.recon.match.id, cell.recon.identifierSpace);
+            EntityIdValue reconEntityIdValue = null;
+            String entityType = null;
             if (entityIdValue instanceof ItemIdValue) {
-                return new ReconItemIdValue(cell.recon, cell.value.toString());
+                reconEntityIdValue = new ReconItemIdValue(cell.recon, cell.value.toString());
+                entityType = "item";
             } else if (entityIdValue instanceof MediaInfoIdValue) {
-                return new ReconMediaInfoIdValue(cell.recon, cell.value.toString());
+                reconEntityIdValue = new ReconMediaInfoIdValue(cell.recon, cell.value.toString());
+                entityType = "mediainfo";
             } else if (entityIdValue instanceof PropertyIdValue) {
-                return new ReconPropertyIdValue(cell.recon, cell.value.toString());
+                reconEntityIdValue = new ReconPropertyIdValue(cell.recon, cell.value.toString());
+                entityType = "property";
             }
+            if (reconEntityIdValue == null) {
+            	throw new SkipSchemaExpressionException();
+            }
+            if (cell.recon.identifierSpace == null || !cell.recon.identifierSpace.equals(ctxt.getBaseIRIForEntityType(entityType))) {
+                QAWarning warning = new QAWarning("invalid-identifier-space", null, QAWarning.Severity.INFO, 1);
+                warning.setProperty("example_cell", cell.value.toString());
+                warning.setProperty("expected_site_iri", ctxt.getBaseIRIForEntityType(entityType));
+                ctxt.addWarning(warning);
+                throw new SkipSchemaExpressionException();
+            }
+            return reconEntityIdValue;
         }
         throw new SkipSchemaExpressionException();
     }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbExpression.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbExpression.java
index d610c39fc..73ff1f203 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbExpression.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbExpression.java
@@ -47,6 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
         @Type(value = WbDateVariable.class, name = "wbdatevariable"),
         @Type(value = WbMonolingualExpr.class, name = "wbmonolingualexpr"),
         @Type(value = WbPropConstant.class, name = "wbpropconstant"),
+        @Type(value = WbEntityIdValueConstant.class, name = "wbentityidvalueconstant"),
         @Type(value = WbLanguageConstant.class, name = "wblanguageconstant"),
         @Type(value = WbLanguageVariable.class, name = "wblanguagevariable"),
         @Type(value = WbQuantityExpr.class, name = "wbquantityexpr"), })
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbItemDocumentExpr.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbItemDocumentExpr.java
index f8162c878..03b34f6d4 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbItemDocumentExpr.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbItemDocumentExpr.java
@@ -29,7 +29,7 @@ import java.util.List;
 import org.jsoup.helper.Validate;
 import org.openrefine.wikidata.schema.exceptions.SkipSchemaExpressionException;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
@@ -74,7 +74,7 @@ public class WbItemDocumentExpr implements WbExpression<TermedStatementEntityUpd
     public TermedStatementEntityUpdate evaluate(ExpressionContext ctxt)
             throws SkipSchemaExpressionException {
         EntityIdValue subjectId = getSubject().evaluate(ctxt);
-        ItemUpdateBuilder update = new ItemUpdateBuilder(subjectId);
+        TermedStatementEntityUpdateBuilder update = new TermedStatementEntityUpdateBuilder(subjectId);
         for (WbStatementGroupExpr expr : getStatementGroups()) {
             try {
                 for (Statement s : expr.evaluate(ctxt, subjectId).getStatements()) {
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbNameDescExpr.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbNameDescExpr.java
index 065ec2139..e6bed8613 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbNameDescExpr.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WbNameDescExpr.java
@@ -25,7 +25,7 @@ package org.openrefine.wikidata.schema;
 
 import org.jsoup.helper.Validate;
 import org.openrefine.wikidata.schema.exceptions.SkipSchemaExpressionException;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -35,7 +35,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 /**
  * An expression that represent a term (label, description or alias). The
  * structure is slightly different from other expressions because we need to
- * call different methods on {@link ItemUpdateBuilder}.
+ * call different methods on {@link TermedStatementEntityUpdateBuilder}.
  * 
  * @author Antonin Delpeuch
  *
@@ -67,7 +67,7 @@ public class WbNameDescExpr {
      * @param ctxt
      *            the evaluation context for the expression
      */
-    public void contributeTo(ItemUpdateBuilder item, ExpressionContext ctxt) {
+    public void contributeTo(TermedStatementEntityUpdateBuilder item, ExpressionContext ctxt) {
         try {
             MonolingualTextValue val = getValue().evaluate(ctxt);
             switch (getType()) {
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WikibaseSchema.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WikibaseSchema.java
index 351b8b8e2..95dac314a 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WikibaseSchema.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/WikibaseSchema.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.openrefine.wikidata.qa.QAWarningStore;
 import org.openrefine.wikidata.schema.exceptions.SkipSchemaExpressionException;
@@ -63,15 +64,19 @@ public class WikibaseSchema implements OverlayModel {
 
     @JsonProperty("siteIri")
     protected String siteIri;
+    
+    @JsonProperty("entityTypeSiteIRI")
+    protected Map<String, String> entityTypeSiteIri;
 
     @JsonProperty("mediaWikiApiEndpoint")
     protected String mediaWikiApiEndpoint;
 
     /**
      * Constructor.
+     * @todo remove this, it does not create a valid schema.
      */
     public WikibaseSchema() {
-
+    	entityTypeSiteIri = Collections.emptyMap();
     }
 
     /**
@@ -80,9 +85,11 @@ public class WikibaseSchema implements OverlayModel {
     @JsonCreator
     public WikibaseSchema(@JsonProperty("itemDocuments") List<WbItemDocumentExpr> exprs,
                           @JsonProperty("siteIri") String siteIri,
+                          @JsonProperty("entityTypeSiteIRI") Map<String, String> entityTypeSiteIri,
                           @JsonProperty("mediaWikiApiEndpoint") String mediaWikiApiEndpoint) {
         this.itemDocumentExprs = exprs;
         this.siteIri = siteIri;
+        this.entityTypeSiteIri = entityTypeSiteIri != null ? entityTypeSiteIri : Collections.emptyMap();
         this.mediaWikiApiEndpoint = mediaWikiApiEndpoint != null ? mediaWikiApiEndpoint : ApiConnection.URL_WIKIDATA_API;
     }
 
@@ -93,6 +100,14 @@ public class WikibaseSchema implements OverlayModel {
     public String getSiteIri() {
         return siteIri;
     }
+    
+    /**
+     * @return the site IRI of the Wikibase instance referenced by this schema
+     */
+    @JsonProperty("entityTypeSiteIRI")
+    public Map<String, String> getEntityTypeSiteIri() {
+        return entityTypeSiteIri;
+    }
 
     /**
      * @return the list of document expressions for this schema
@@ -177,7 +192,7 @@ public class WikibaseSchema implements OverlayModel {
 
         @Override
         public boolean visit(Project project, int rowIndex, Row row) {
-            ExpressionContext ctxt = new ExpressionContext(siteIri, mediaWikiApiEndpoint, rowIndex, row, project.columnModel, warningStore);
+            ExpressionContext ctxt = new ExpressionContext(siteIri, entityTypeSiteIri, mediaWikiApiEndpoint, rowIndex, row, project.columnModel, warningStore);
             result.addAll(evaluateItemDocuments(ctxt));
             return false;
         }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconItemIdValue.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconItemIdValue.java
index dc57d364d..05a532adb 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconItemIdValue.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconItemIdValue.java
@@ -33,6 +33,11 @@ public class ReconItemIdValue extends ReconEntityIdValue implements ItemIdValue
         super(recon, cellValue);
     }
 
+	@Override
+	public boolean isPlaceholder() {
+		return isNew();
+	}
+
     @Override
     public String getEntityType() {
         return ET_ITEM;
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconMediaInfoIdValue.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconMediaInfoIdValue.java
index 314f5452b..8fcecd0fc 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconMediaInfoIdValue.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconMediaInfoIdValue.java
@@ -34,6 +34,11 @@ public class ReconMediaInfoIdValue extends ReconEntityIdValue implements MediaIn
         super(recon, cellValue);
     }
 
+	@Override
+	public boolean isPlaceholder() {
+		return isNew();
+	}
+
     @Override
     public String getEntityType() {
         return EntityIdValue.ET_MEDIA_INFO;
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconPropertyIdValue.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconPropertyIdValue.java
index b6767d2ba..28167e48c 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconPropertyIdValue.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/ReconPropertyIdValue.java
@@ -33,6 +33,11 @@ public class ReconPropertyIdValue extends ReconEntityIdValue implements Property
         super(recon, cellValue);
     }
 
+	@Override
+	public boolean isPlaceholder() {
+		return isNew();
+	}
+
     @Override
     public String getEntityType() {
         return ET_PROPERTY;
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValue.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValue.java
index 9898ec3c1..3e66674e3 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValue.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValue.java
@@ -27,6 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.wikidata.wdtk.datamodel.helpers.Hash;
+import org.wikidata.wdtk.datamodel.implementation.EntityIdValueImpl;
+import org.wikidata.wdtk.datamodel.interfaces.DatatypeIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.ValueVisitor;
 
@@ -50,6 +52,26 @@ public abstract class SuggestedEntityIdValue implements PrefetchedEntityIdValue
         _siteIRI = siteIRI;
         _label = label;
     }
+    
+    public static SuggestedEntityIdValue build(String id, String siteIRI, String label) {
+    	String entityType = EntityIdValueImpl.guessEntityTypeFromId(id);
+    	if (DatatypeIdValue.DT_ITEM.equals(entityType)) {
+    		return new SuggestedItemIdValue(id, siteIRI, label);
+    	} else if (DatatypeIdValue.DT_PROPERTY.equals(entityType)) {
+    		return new SuggestedPropertyIdValue(id, siteIRI, label);
+    	} else if (DatatypeIdValue.DT_MEDIA_INFO.equals(entityType)) {
+    		return new SuggestedMediaInfoIdValue(id, siteIRI, label);
+    	} else if (DatatypeIdValue.DT_LEXEME.equals(entityType)) {
+    		return new SuggestedLexemeIdValue(id, siteIRI, label);
+    	} else if (DatatypeIdValue.DT_FORM.equals(entityType)) {
+    		return new SuggestedFormIdValue(id, siteIRI, label);
+    	} else if (DatatypeIdValue.DT_SENSE.equals(entityType)) {
+    		return new SuggestedSenseIdValue(id, siteIRI, label);
+    	} else {
+    		throw new IllegalArgumentException(
+    				String.format("Unsupported datatype for suggested entity values: %s", entityType));
+    	}
+    }
 
     @Override
     @JsonProperty("id")
@@ -80,6 +102,11 @@ public abstract class SuggestedEntityIdValue implements PrefetchedEntityIdValue
     public String getIri() {
         return getSiteIri() + getId();
     }
+    
+	@Override
+	public boolean isPlaceholder() {
+		return false;
+	}
 
     @Override
     public <T> T accept(ValueVisitor<T> valueVisitor) {
@@ -99,5 +126,10 @@ public abstract class SuggestedEntityIdValue implements PrefetchedEntityIdValue
     public int hashCode() {
         return Hash.hashCode(this);
     }
+    
+    @Override
+    public String toString() {
+    	return getIri();
+    }
 
 }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/ItemUpdateBuilder.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/ItemUpdateBuilder.java
deleted file mode 100644
index 3d714f196..000000000
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/ItemUpdateBuilder.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * MIT License
- * 
- * Copyright (c) 2018 Antonin Delpeuch
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- ******************************************************************************/
-package org.openrefine.wikidata.updates;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.jsoup.helper.Validate;
-import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
-import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
-import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
-import org.wikidata.wdtk.datamodel.interfaces.Statement;
-
-/**
- * Constructs a {@link ItemUpdate} incrementally.
- * 
- * @author Antonin Delpeuch
- *
- */
-public class ItemUpdateBuilder {
-
-    private EntityIdValue qid;
-    private List<Statement> addedStatements;
-    private Set<Statement> deletedStatements;
-    private Set<MonolingualTextValue> labels;
-    private Set<MonolingualTextValue> labelsIfNew;
-    private Set<MonolingualTextValue> descriptions;
-    private Set<MonolingualTextValue> descriptionsIfNew;
-    private Set<MonolingualTextValue> aliases;
-    private boolean built;
-
-    /**
-     * Constructor.
-     * 
-     * @param qid
-     *            the subject of the document. It can be a reconciled item value for
-     *            new items.
-     */
-    public ItemUpdateBuilder(EntityIdValue qid) {
-        Validate.notNull(qid);
-        this.qid = qid;
-        this.addedStatements = new ArrayList<>();
-        this.deletedStatements = new HashSet<Statement>();
-        this.labels = new HashSet<MonolingualTextValue>();
-        this.labelsIfNew = new HashSet<MonolingualTextValue>();
-        this.descriptions = new HashSet<MonolingualTextValue>();
-        this.descriptionsIfNew = new HashSet<MonolingualTextValue>();
-        this.aliases = new HashSet<MonolingualTextValue>();
-        this.built = false;
-    }
-
-    /**
-     * Mark a statement for insertion. If it matches an existing statement, it will
-     * update the statement instead.
-     * 
-     * @param statement
-     *            the statement to add or update
-     */
-    public ItemUpdateBuilder addStatement(Statement statement) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        addedStatements.add(statement);
-        return this;
-    }
-
-    /**
-     * Mark a statement for deletion. If no such statement exists, nothing will be
-     * deleted.
-     * 
-     * @param statement
-     *            the statement to delete
-     */
-    public ItemUpdateBuilder deleteStatement(Statement statement) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        deletedStatements.add(statement);
-        return this;
-    }
-
-    /**
-     * Add a list of statement, as in {@link addStatement}.
-     * 
-     * @param statements
-     *            the statements to add
-     */
-    public ItemUpdateBuilder addStatements(Set<Statement> statements) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        addedStatements.addAll(statements);
-        return this;
-    }
-
-    /**
-     * Delete a list of statements, as in {@link deleteStatement}.
-     * 
-     * @param statements
-     *            the statements to delete
-     */
-    public ItemUpdateBuilder deleteStatements(Set<Statement> statements) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        deletedStatements.addAll(statements);
-        return this;
-    }
-
-    /**
-     * Adds a label to the item.
-     * 
-     * @param label
-     *            the label to add
-     * @param override
-     *            whether the label should be added even if there is already a label in that language
-     */
-    public ItemUpdateBuilder addLabel(MonolingualTextValue label, boolean override) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        if (override) {
-        	labels.add(label);
-        } else {
-        	labelsIfNew.add(label);
-        }
-        return this;
-    }
-
-    /**
-     * Adds a list of labels to the item.
-     * 
-     * @param labels
-     *            the labels to add
-     * @param override
-     *            whether the label should be added even if there is already a label in that language
-     */
-    public ItemUpdateBuilder addLabels(Set<MonolingualTextValue> labels, boolean override) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        if (override) {
-        	this.labels.addAll(labels);
-        } else {
-        	labelsIfNew.addAll(labels);
-        }
-        return this;
-    }
-
-    /**
-     * Adds a description to the item.
-     * 
-     * @param description
-     *            the description to add
-     * @param override
-     *            whether the description should be added even if there is already a description in that language
-     */
-    public ItemUpdateBuilder addDescription(MonolingualTextValue description, boolean override) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        if (override) {
-        	descriptions.add(description);
-        } else {
-        	descriptionsIfNew.add(description);
-        }
-        return this;
-    }
-
-    /**
-     * Adds a list of descriptions to the item.
-     * 
-     * @param descriptions
-     *            the descriptions to add
-     * @param override
-     *            whether the description should be added even if there is already a description in that language
-     */
-    public ItemUpdateBuilder addDescriptions(Set<MonolingualTextValue> descriptions, boolean override) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        if (override) {
-        	this.descriptions.addAll(descriptions);
-        } else {
-        	descriptionsIfNew.addAll(descriptions);
-        }
-        return this;
-    }
-
-    /**
-     * Adds an alias to the item. It will be added to any existing aliases in that
-     * language.
-     * 
-     * @param alias
-     *            the alias to add
-     */
-    public ItemUpdateBuilder addAlias(MonolingualTextValue alias) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        aliases.add(alias);
-        return this;
-    }
-
-    /**
-     * Adds a list of aliases to the item. They will be added to any existing
-     * aliases in each language.
-     * 
-     * @param aliases
-     *            the aliases to add
-     */
-    public ItemUpdateBuilder addAliases(Set<MonolingualTextValue> aliases) {
-        Validate.isTrue(!built, "ItemUpdate has already been built");
-        this.aliases.addAll(aliases);
-        return this;
-    }
-
-    /**
-     * Constructs the {@link ItemUpdate}.
-     * 
-     * @return
-     */
-    public TermedStatementEntityUpdate build() {
-        built = true;
-        return new TermedStatementEntityUpdate(qid, addedStatements, deletedStatements, labels, labelsIfNew, descriptions, descriptionsIfNew, aliases);
-    }
-
-}
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateScheduler.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateScheduler.java
index c52032c72..9432e70aa 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateScheduler.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateScheduler.java
@@ -33,7 +33,7 @@ import java.util.Set;
 
 import org.openrefine.wikidata.schema.entityvalues.ReconItemIdValue;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
 
@@ -64,14 +64,14 @@ public class QuickStatementsUpdateScheduler implements UpdateScheduler {
      */
     protected void splitUpdate(TermedStatementEntityUpdate update)
             throws ImpossibleSchedulingException {
-        ItemUpdateBuilder remainingUpdateBuilder = new ItemUpdateBuilder(update.getItemId())
+        TermedStatementEntityUpdateBuilder remainingUpdateBuilder = new TermedStatementEntityUpdateBuilder(update.getItemId())
                 .addLabels(update.getLabels(), true)
                 .addLabels(update.getLabelsIfNew(), false)
                 .addDescriptions(update.getDescriptions(), true)
                 .addDescriptions(update.getDescriptionsIfNew(), false)
                 .addAliases(update.getAliases())
                 .deleteStatements(update.getDeletedStatements());
-        Map<ItemIdValue, ItemUpdateBuilder> referencingUpdates = new HashMap<>();
+        Map<ItemIdValue, TermedStatementEntityUpdateBuilder> referencingUpdates = new HashMap<>();
 
         for (Statement statement : update.getAddedStatements()) {
             Set<ReconItemIdValue> pointers = extractor.extractPointers(statement);
@@ -79,9 +79,9 @@ public class QuickStatementsUpdateScheduler implements UpdateScheduler {
                 remainingUpdateBuilder.addStatement(statement);
             } else if (pointers.size() == 1 && !update.isNew()) {
                 ItemIdValue pointer = pointers.stream().findFirst().get();
-                ItemUpdateBuilder referencingBuilder = referencingUpdates.get(pointer);
+                TermedStatementEntityUpdateBuilder referencingBuilder = referencingUpdates.get(pointer);
                 if (referencingBuilder == null) {
-                    referencingBuilder = new ItemUpdateBuilder(update.getItemId());
+                    referencingBuilder = new TermedStatementEntityUpdateBuilder(update.getItemId());
                 }
                 referencingBuilder.addStatement(statement);
                 referencingUpdates.put(pointer, referencingBuilder);
@@ -98,7 +98,7 @@ public class QuickStatementsUpdateScheduler implements UpdateScheduler {
             pointerFreeUpdates.add(pointerFree);
         }
         // Add the other updates to the map
-        for (Entry<ItemIdValue, ItemUpdateBuilder> entry : referencingUpdates.entrySet()) {
+        for (Entry<ItemIdValue, TermedStatementEntityUpdateBuilder> entry : referencingUpdates.entrySet()) {
         	TermedStatementEntityUpdate pointerUpdate = entry.getValue().build();
             UpdateSequence pointerUpdatesForKey = pointerUpdates.get(entry.getKey());
             if (pointerUpdatesForKey == null) {
@@ -135,7 +135,7 @@ public class QuickStatementsUpdateScheduler implements UpdateScheduler {
         // (this is just for the sake of correctness, it would be bad to do that
         // as the items would remain blank in this batch).
         for (ItemIdValue missingId : mentionedNewEntities) {
-            fullSchedule.add(new ItemUpdateBuilder(missingId).build());
+            fullSchedule.add(new TermedStatementEntityUpdateBuilder(missingId).build());
             fullSchedule.addAll(pointerUpdates.get(missingId).getUpdates());
         }
         return fullSchedule;
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/UpdateSequence.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/UpdateSequence.java
index 12121833f..c67fde64b 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/UpdateSequence.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/UpdateSequence.java
@@ -48,7 +48,7 @@ public class UpdateSequence {
     /**
      * An index to keep track of where each item is touched in the sequence
      */
-    private Map<ItemIdValue, Integer> index = new HashMap<>();
+    private Map<EntityIdValue, Integer> index = new HashMap<>();
 
     /**
      * Adds a new update to the list, merging it with any existing one with the same
@@ -63,7 +63,7 @@ public class UpdateSequence {
             TermedStatementEntityUpdate oldUpdate = updates.get(i);
             updates.set(i, oldUpdate.merge(update));
         } else {
-            index.put((ItemIdValue) subject, updates.size());
+            index.put(subject, updates.size());
             updates.add(update);
         }
     }
@@ -78,7 +78,7 @@ public class UpdateSequence {
     /**
      * @return the set of touched subjects
      */
-    public Set<ItemIdValue> getSubjects() {
+    public Set<EntityIdValue> getSubjects() {
         return index.keySet();
     }
 }
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateScheduler.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateScheduler.java
index 6aaa2323a..fd6d63278 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateScheduler.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateScheduler.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 import org.openrefine.wikidata.schema.entityvalues.ReconItemIdValue;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
 
@@ -84,7 +84,7 @@ public class WikibaseAPIUpdateScheduler implements UpdateScheduler {
         Set<ItemIdValue> unseenPointers = new HashSet<>(allPointers);
         unseenPointers.removeAll(pointerFreeUpdates.getSubjects());
 
-        result.addAll(unseenPointers.stream().map(e -> new ItemUpdateBuilder(e).build()).collect(Collectors.toList()));
+        result.addAll(unseenPointers.stream().map(e -> new TermedStatementEntityUpdateBuilder(e).build()).collect(Collectors.toList()));
 
         // Part 2: add all the pointer full updates
         result.addAll(pointerFullUpdates.getUpdates());
@@ -98,14 +98,14 @@ public class WikibaseAPIUpdateScheduler implements UpdateScheduler {
      * @param update
      */
     protected void splitUpdate(TermedStatementEntityUpdate update) {
-        ItemUpdateBuilder pointerFreeBuilder = new ItemUpdateBuilder(update.getItemId())
+        TermedStatementEntityUpdateBuilder pointerFreeBuilder = new TermedStatementEntityUpdateBuilder(update.getItemId())
         		.addLabels(update.getLabels(), true)
         		.addLabels(update.getLabelsIfNew(), false)
                 .addDescriptions(update.getDescriptions(), true)
                 .addDescriptions(update.getDescriptionsIfNew(), false)
                 .addAliases(update.getAliases())
                 .deleteStatements(update.getDeletedStatements());
-        ItemUpdateBuilder pointerFullBuilder = new ItemUpdateBuilder(update.getItemId());
+        TermedStatementEntityUpdateBuilder pointerFullBuilder = new TermedStatementEntityUpdateBuilder(update.getItemId());
 
         for (Statement statement : update.getAddedStatements()) {
             Set<ReconItemIdValue> pointers = extractor.extractPointers(statement);
diff --git a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/utils/EntityCache.java b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/utils/EntityCache.java
index d61fbc939..760d5ead1 100644
--- a/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/utils/EntityCache.java
+++ b/OpenRefine/extensions/wikidata/src/org/openrefine/wikidata/utils/EntityCache.java
@@ -85,6 +85,12 @@ public class EntityCache {
         return cache.apply(id.getId());
     }
 
+    /**
+     * Get an entity cache for a given Wikibase instance.
+     * @param siteIri
+     * @param mediaWikiApiEndpoint
+     * @return
+     */
     public static EntityCache getEntityCache(String siteIri, String mediaWikiApiEndpoint) {
         EntityCache entityCache = entityCacheMap.get(siteIri);
         if (entityCache == null) {
@@ -93,6 +99,15 @@ public class EntityCache {
         }
         return entityCache;
     }
+    
+    /**
+     * Provided for testability.
+     * @param siteIri
+     * @param cache
+     */
+    public static void setEntityCache(String siteIri, EntityCache cache) {
+    	entityCacheMap.put(siteIri, cache);
+    }
 
     public List<EntityDocument> getMultipleDocuments(List<EntityIdValue> entityIds) throws ExecutionException {
         List<String> ids = entityIds.stream().map(entityId -> entityId.getId()).collect(Collectors.toList());
@@ -102,4 +117,8 @@ public class EntityCache {
     public static EntityDocument getEntityDocument(String entityPrefix, String mediaWikiApiEndpoint, EntityIdValue id) {
         return getEntityCache(entityPrefix, mediaWikiApiEndpoint).get(id);
     }
+
+	public static void removeEntityCache(String siteIri) {
+		entityCacheMap.remove(siteIri);
+	}
 }
diff --git a/OpenRefine/extensions/wikidata/tests/data/manifest/commons-manifest-v2.0.json b/OpenRefine/extensions/wikidata/tests/data/manifest/commons-manifest-v2.0.json
new file mode 100644
index 000000000..245e59d1d
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/tests/data/manifest/commons-manifest-v2.0.json
@@ -0,0 +1,46 @@
+{
+  "version": "2.0",
+  "mediawiki": {
+    "name": "Wikimedia Commons",
+    "root": "https://commons.wikimedia.org/wiki/",
+    "main_page": "https://commons.wikimedia.org/wiki/Main_Page",
+    "api": "https://commons.wikimedia.org/w/api.php"
+  },
+  "wikibase": {
+    "site_iri": "https://commons.wikimedia.org/entity/",
+    "maxlag": 5,
+    "properties": {
+      "instance_of": "P31",
+      "subclass_of": "P279"
+    },
+    "constraints": {
+      "property_constraint_pid": "P2302",
+      "exception_to_constraint_pid": "P2303",
+      "constraint_status_pid": "P2316",
+      "mandatory_constraint_qid": "Q21502408",
+      "suggestion_constraint_qid": "Q62026391",
+      "distinct_values_constraint_qid": "Q21502410"
+    }
+  },
+  "oauth": {
+    "registration_page": "https://commons.wikimedia.org/wiki/Special:OAuthConsumerRegistration/propose"
+  },
+  "entity_types": {
+    "item": {
+       "site_iri": "http://www.wikidata.org/entity/",
+       "reconciliation_endpoint": "https://wikidata.reconci.link/${lang}/api",
+       "mediawiki_api": "https://www.wikidata.org/w/api.php"
+    },
+    "property": {
+       "site_iri": "http://www.wikidata.org/entity/",
+       "mediawiki_api": "https://www.wikidata.org/w/api.php"
+    },
+    "mediainfo": {
+       "site_iri": "https://commons.wikimedia.org/entity/",
+       "reconciliation_endpoint": "https://commonsreconcile.toolforge.org/${lang}/api"
+    }
+  },
+  "editgroups": {
+    "url_schema": "([[:toollabs:editgroups-commons/b/OR/${batch_id}|details]])"
+  }
+}
diff --git a/OpenRefine/extensions/wikidata/tests/data/operations/save-schema.json b/OpenRefine/extensions/wikidata/tests/data/operations/save-schema.json
index 5b8c78d62..78d95401f 100644
--- a/OpenRefine/extensions/wikidata/tests/data/operations/save-schema.json
+++ b/OpenRefine/extensions/wikidata/tests/data/operations/save-schema.json
@@ -30,6 +30,7 @@
         }
       ],
       "siteIri": "http://www.wikidata.org/entity/",
-      "mediaWikiApiEndpoint":"https://www.wikidata.org/w/api.php"
+      "mediaWikiApiEndpoint":"https://www.wikidata.org/w/api.php",
+      "entityTypeSiteIRI": {}
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/data/schema/history_of_medicine_normalized.json b/OpenRefine/extensions/wikidata/tests/data/schema/history_of_medicine_normalized.json
index 8ef811097..61049d8e9 100644
--- a/OpenRefine/extensions/wikidata/tests/data/schema/history_of_medicine_normalized.json
+++ b/OpenRefine/extensions/wikidata/tests/data/schema/history_of_medicine_normalized.json
@@ -1 +1 @@
-{"itemDocuments":[{"subject":{"type":"wbitemvariable","columnName":"name"},"statementGroups":[{"property":{"datatype":"wikibase-item","pid":"P39","label":"position held","type":"wbpropconstant"},"statements":[{"references":[{"snaks":[{"prop":{"datatype":"wikibase-item","pid":"P248","label":"stated in","type":"wbpropconstant"},"value":{"label":"The History of The Royal Society of Medicine","type":"wbitemconstant","qid":"Q42036099"}},{"prop":{"datatype":"string","pid":"P304","label":"page","type":"wbpropconstant"},"value":{"type":"wbstringconstant","value":"330-333"}}]}],"qualifiers":[{"prop":{"datatype":"wikibase-item","pid":"P642","label":"of","type":"wbpropconstant"},"value":{"label":"History of Medicine Society","type":"wbitemconstant","qid":"Q37461404"}},{"prop":{"datatype":"time","pid":"P580","label":"start date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"start"}},{"prop":{"datatype":"time","pid":"P582","label":"end date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"end"}}],"value":{"label":"president","type":"wbitemconstant","qid":"Q30461"}}]}],"nameDescs":[]},{"subject":{"label":"History of Medicine Society","type":"wbitemconstant","qid":"Q37461404"},"statementGroups":[{"property":{"datatype":"wikibase-item","pid":"P488","label":"chairperson","type":"wbpropconstant"},"statements":[{"references":[{"snaks":[{"prop":{"datatype":"wikibase-item","pid":"P248","label":"stated in","type":"wbpropconstant"},"value":{"label":"The History of The Royal Society of Medicine","type":"wbitemconstant","qid":"Q42036099"}},{"prop":{"datatype":"string","pid":"P304","label":"page","type":"wbpropconstant"},"value":{"type":"wbstringconstant","value":"330-333"}}]}],"qualifiers":[{"prop":{"datatype":"time","pid":"P580","label":"start date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"start"}},{"prop":{"datatype":"time","pid":"P582","label":"end date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"end"}}],"value":{"type":"wbitemvariable","columnName":"name"}}]}],"nameDescs":[]}],"siteIri":"http://www.wikidata.org/entity/","mediaWikiApiEndpoint":"https://www.wikidata.org/w/api.php"}
+{"itemDocuments":[{"subject":{"type":"wbitemvariable","columnName":"name"},"statementGroups":[{"property":{"datatype":"wikibase-item","pid":"P39","label":"position held","type":"wbpropconstant"},"statements":[{"references":[{"snaks":[{"prop":{"datatype":"wikibase-item","pid":"P248","label":"stated in","type":"wbpropconstant"},"value":{"label":"The History of The Royal Society of Medicine","type":"wbitemconstant","qid":"Q42036099"}},{"prop":{"datatype":"string","pid":"P304","label":"page","type":"wbpropconstant"},"value":{"type":"wbstringconstant","value":"330-333"}}]}],"qualifiers":[{"prop":{"datatype":"wikibase-item","pid":"P642","label":"of","type":"wbpropconstant"},"value":{"label":"History of Medicine Society","type":"wbitemconstant","qid":"Q37461404"}},{"prop":{"datatype":"time","pid":"P580","label":"start date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"start"}},{"prop":{"datatype":"time","pid":"P582","label":"end date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"end"}}],"value":{"label":"president","type":"wbitemconstant","qid":"Q30461"}}]}],"nameDescs":[]},{"subject":{"label":"History of Medicine Society","type":"wbitemconstant","qid":"Q37461404"},"statementGroups":[{"property":{"datatype":"wikibase-item","pid":"P488","label":"chairperson","type":"wbpropconstant"},"statements":[{"references":[{"snaks":[{"prop":{"datatype":"wikibase-item","pid":"P248","label":"stated in","type":"wbpropconstant"},"value":{"label":"The History of The Royal Society of Medicine","type":"wbitemconstant","qid":"Q42036099"}},{"prop":{"datatype":"string","pid":"P304","label":"page","type":"wbpropconstant"},"value":{"type":"wbstringconstant","value":"330-333"}}]}],"qualifiers":[{"prop":{"datatype":"time","pid":"P580","label":"start date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"start"}},{"prop":{"datatype":"time","pid":"P582","label":"end date","type":"wbpropconstant"},"value":{"type":"wbdatevariable","columnName":"end"}}],"value":{"type":"wbitemvariable","columnName":"name"}}]}],"nameDescs":[]}],"siteIri":"http://www.wikidata.org/entity/","mediaWikiApiEndpoint":"https://www.wikidata.org/w/api.php","entityTypeSiteIRI":{}}
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java
index b14644a4b..373e65a87 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/CommandTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.commands;
 
 import static org.mockito.Mockito.mock;
@@ -49,7 +50,6 @@ public abstract class CommandTest extends WikidataRefineTest {
     protected StringWriter writer = null;
 
     protected Command command = null;
-   
 
     @BeforeMethod(alwaysRun = true)
     public void setUpProject() {
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/ConnectionManagerTests.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/ConnectionManagerTests.java
new file mode 100644
index 000000000..de8637a3a
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/ConnectionManagerTests.java
@@ -0,0 +1,63 @@
+
+package org.openrefine.wikidata.commands;
+
+public class ConnectionManagerTests {
+    /**
+     * 
+     * TODO the following tests were written for LoginCommand but actually test ConnectionManager. They should be
+     * rewritten to directly test this class.
+     * 
+     * 
+     * @Test public void testLogoutFailedBecauseCredentialsExpired() throws Exception { // if our credentials expire and
+     *       we try to log out, // we should consider that the logout succeeded. // Workaround for
+     *       https://github.com/Wikidata/Wikidata-Toolkit/issues/511 BasicApiConnection connection =
+     *       mock(BasicApiConnection.class);
+     *       whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
+     *       when(connection.getCurrentUser()).thenReturn(username);
+     * 
+     *       when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+     *       when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
+     *       when(request.getParameter(USERNAME)).thenReturn(username);
+     *       when(request.getParameter(PASSWORD)).thenReturn(password);
+     * 
+     *       // login first command.doPost(request, response);
+     * 
+     *       assertTrue(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
+     * 
+     *       // logout when(request.getParameter("logout")).thenReturn("true"); doThrow(new
+     *       MediaWikiApiErrorException("assertuserfailed", "No longer logged in")).when(connection).logout();
+     *       command.doPost(request, response);
+     * 
+     *       // not logged in anymore assertFalse(ConnectionManager.getInstance().isLoggedIn(apiEndpoint)); }
+     * 
+     * @Test public void testMultipleConnections() throws Exception { BasicApiConnection connection =
+     *       mock(BasicApiConnection.class);
+     *       whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
+     *       when(connection.getCurrentUser()).thenReturn(username);
+     * 
+     *       String wikibase1 = "https://www.wikibase1.org/w/api.php"; String wikibase2 =
+     *       "https://www.wikibase2.org/w/api.php";
+     * 
+     *       when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+     *       when(request.getParameter(USERNAME)).thenReturn(username);
+     *       when(request.getParameter(PASSWORD)).thenReturn(password);
+     * 
+     *       // login to one endpoint first when(request.getParameter(API_ENDPOINT)).thenReturn(wikibase1);
+     *       command.doPost(request, response);
+     * 
+     *       // not logged in to another endpoint assertFalse(ConnectionManager.getInstance().isLoggedIn(wikibase2));
+     * 
+     *       // login to another endpoint when(request.getParameter(API_ENDPOINT)).thenReturn(wikibase2);
+     *       command.doPost(request, response);
+     * 
+     *       // logged in to both endpoints assertTrue(ConnectionManager.getInstance().isLoggedIn(wikibase1));
+     *       assertTrue(ConnectionManager.getInstance().isLoggedIn(wikibase2));
+     * 
+     *       // logout from the first endpoint when(request.getParameter("logout")).thenReturn("true");
+     *       when(request.getParameter(API_ENDPOINT)).thenReturn(wikibase1); command.doPost(request, response);
+     * 
+     *       // logged out from the first endpoint assertFalse(ConnectionManager.getInstance().isLoggedIn(wikibase1));
+     * 
+     *       // still logged in to another endpoint assertTrue(ConnectionManager.getInstance().isLoggedIn(wikibase2)); }
+     */
+}
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java
index c6f0f8a74..d853e2719 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java
@@ -1,22 +1,28 @@
+
 package org.openrefine.wikidata.commands;
 
-import com.google.refine.ProjectManager;
-import com.google.refine.commands.Command;
-import com.google.refine.preference.PreferenceStore;
-import com.google.refine.util.ParsingUtilities;
-import org.mockito.ArgumentCaptor;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.wikidata.wdtk.wikibaseapi.BasicApiConnection;
-import org.wikidata.wdtk.wikibaseapi.LoginFailedException;
-import org.wikidata.wdtk.wikibaseapi.OAuthApiConnection;
-import org.wikidata.wdtk.wikibaseapi.apierrors.AssertUserFailedException;
-import org.wikidata.wdtk.wikibaseapi.apierrors.MediaWikiApiErrorException;
+import static com.google.refine.util.TestUtils.assertEqualAsJson;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.openrefine.wikidata.commands.LoginCommand.ACCESS_SECRET;
+import static org.openrefine.wikidata.commands.LoginCommand.ACCESS_TOKEN;
+import static org.openrefine.wikidata.commands.LoginCommand.API_ENDPOINT;
+import static org.openrefine.wikidata.commands.LoginCommand.CONSUMER_SECRET;
+import static org.openrefine.wikidata.commands.LoginCommand.CONSUMER_TOKEN;
+import static org.openrefine.wikidata.commands.LoginCommand.PASSWORD;
+import static org.openrefine.wikidata.commands.LoginCommand.USERNAME;
+import static org.openrefine.wikidata.commands.LoginCommand.WIKIBASE_COOKIE_PREFIX;
+import static org.openrefine.wikidata.commands.LoginCommand.getCookieValue;
+import static org.openrefine.wikidata.commands.LoginCommand.removeCRLF;
+import static org.openrefine.wikidata.commands.LoginCommand.sanitizeCookieKey;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -28,15 +34,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.google.refine.util.TestUtils.assertEqualAsJson;
-import static org.mockito.ArgumentMatchers.anyMap;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.verify;
-import static org.openrefine.wikidata.commands.LoginCommand.*;
-import static org.powermock.api.mockito.PowerMockito.*;
-import static org.testng.Assert.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.wikidata.wdtk.wikibaseapi.BasicApiConnection;
+import org.wikidata.wdtk.wikibaseapi.OAuthApiConnection;
+
+import com.google.refine.commands.Command;
 
-@PrepareForTest(ConnectionManager.class)
 public class LoginCommandTest extends CommandTest {
 
     private static final String apiEndpoint = "https://www.wikidata.org/w/api.php";
@@ -71,37 +80,19 @@ public class LoginCommandTest extends CommandTest {
     // used for mocking singleton
     Constructor<ConnectionManager> constructor;
 
-    @BeforeClass
-    public void initConstructor() throws NoSuchMethodException {
-        constructor = ConnectionManager.class.getDeclaredConstructor();
-        constructor.setAccessible(true);
-    }
+    ConnectionManager connectionManager;
 
     @BeforeMethod
     public void setUp() throws Exception {
         command = new LoginCommand();
+        connectionManager = mock(ConnectionManager.class);
+        ((LoginCommand) command).setConnectionManager(connectionManager);
 
-        // mock the ConnectionManager singleton
-        ConnectionManager manager = constructor.newInstance();
-        mockStatic(ConnectionManager.class);
-        given(ConnectionManager.getInstance()).willReturn(manager);
-
-        when(request.getCookies()).thenReturn(new Cookie[]{});
+        when(request.getCookies()).thenReturn(new Cookie[] {});
         cookieCaptor = ArgumentCaptor.forClass(Cookie.class);
         doNothing().when(response).addCookie(cookieCaptor.capture());
     }
 
-    @Test
-    public void testClearCredentialsInPreferences() throws Exception {
-        PreferenceStore prefStore = new PreferenceStore();
-        ProjectManager.singleton = mock(ProjectManager.class);
-        when(ProjectManager.singleton.getPreferenceStore()).thenReturn(prefStore);
-        prefStore.put(ConnectionManager.PREFERENCE_STORE_KEY, ParsingUtilities.mapper.createArrayNode());
-        assertNotNull(prefStore.get(ConnectionManager.PREFERENCE_STORE_KEY));
-        constructor.newInstance();
-        assertNull(prefStore.get(ConnectionManager.PREFERENCE_STORE_KEY));
-    }
-
     @Test
     public void testNoApiEndpointPost() throws ServletException, IOException {
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
@@ -137,26 +128,24 @@ public class LoginCommandTest extends CommandTest {
     }
 
     private void assertLogin() {
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
         assertEqualAsJson("{\"logged_in\":true,\"username\":\"" + username + "\",\"mediawiki_api_endpoint\":\"" + apiEndpoint + "\"}",
                 writer.toString());
     }
 
     @Test
     public void testUsernamePasswordLogin() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-        when(connection.getCookies()).thenReturn(makeResponseCookies());
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         when(request.getParameter(USERNAME)).thenReturn(username);
         when(request.getParameter(PASSWORD)).thenReturn(password);
 
+        when(connectionManager.login(apiEndpoint, username, password)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+
         command.doPost(request, response);
 
-        verify(connection).login(username, password);
+        verify(connectionManager, times(1)).login(apiEndpoint, username, password);
 
         assertLogin();
 
@@ -171,24 +160,29 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testUsernamePasswordLoginRememberCredentials() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-        when(connection.getCookies()).thenReturn(makeResponseCookies());
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter("remember-credentials")).thenReturn("on");
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         when(request.getParameter(USERNAME)).thenReturn(username);
         when(request.getParameter(PASSWORD)).thenReturn(password);
 
+        when(connectionManager.login(apiEndpoint, username, password)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        BasicApiConnection connection = mock(BasicApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCookies()).thenReturn(makeResponseCookies());
+        when(connection.getCurrentUser()).thenReturn(username);
+
         command.doPost(request, response);
 
-        verify(connection).login(username, password);
+        verify(connectionManager, times(1)).login(apiEndpoint, username, password);
+
         assertLogin();
 
         Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues());
-        cookieMap.forEach((key, value) -> assertCookieEquals(cookies.get(apiEndpointPrefix + WIKIBASE_COOKIE_PREFIX + key), value, ONE_YEAR));
+        cookieMap.forEach(
+                (key, value) -> assertCookieEquals(cookies.get(apiEndpointPrefix + WIKIBASE_COOKIE_PREFIX + key), value, ONE_YEAR));
         assertCookieEquals(cookies.get(apiEndpointPrefix + USERNAME), username, ONE_YEAR);
         assertCookieEquals(cookies.get(apiEndpointPrefix + CONSUMER_TOKEN), "", 0);
         assertCookieEquals(cookies.get(apiEndpointPrefix + CONSUMER_SECRET), "", 0);
@@ -198,18 +192,22 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testUsernamePasswordLoginWithCookies() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        given(ConnectionManager.convertToBasicApiConnection(anyMap())).willReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-        when(connection.getCookies()).thenReturn(makeResponseCookies());
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         when(request.getCookies()).thenReturn(makeRequestCookies());
 
+        when(connectionManager.login(eq(apiEndpoint), eq(username), Mockito.<List<Cookie>> any())).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        BasicApiConnection connection = mock(BasicApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCookies()).thenReturn(makeResponseCookies());
+        when(connection.getCurrentUser()).thenReturn(username);
+
         command.doPost(request, response);
 
-        verify(connection).checkCredentials();
+        verify(connectionManager, times(1)).login(eq(apiEndpoint), eq(username), Mockito.<List<Cookie>> any());
+
         assertLogin();
 
         Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues());
@@ -222,10 +220,6 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testOwnerOnlyConsumerLogin() throws Exception {
-        OAuthApiConnection connection = mock(OAuthApiConnection.class);
-        whenNew(OAuthApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         when(request.getParameter(CONSUMER_TOKEN)).thenReturn(consumerToken);
@@ -233,8 +227,17 @@ public class LoginCommandTest extends CommandTest {
         when(request.getParameter(ACCESS_TOKEN)).thenReturn(accessToken);
         when(request.getParameter(ACCESS_SECRET)).thenReturn(accessSecret);
 
+        when(connectionManager.login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        OAuthApiConnection connection = mock(OAuthApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCurrentUser()).thenReturn(username);
+
         command.doPost(request, response);
 
+        verify(connectionManager, times(1)).login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret);
+
         assertLogin();
 
         Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues());
@@ -248,10 +251,6 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testOwnerOnlyConsumerLoginRememberCredentials() throws Exception {
-        OAuthApiConnection connection = mock(OAuthApiConnection.class);
-        whenNew(OAuthApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter("remember-credentials")).thenReturn("on");
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
@@ -261,8 +260,16 @@ public class LoginCommandTest extends CommandTest {
         when(request.getParameter(ACCESS_SECRET)).thenReturn(accessSecret);
         when(request.getCookies()).thenReturn(makeRequestCookies());
 
+        when(connectionManager.login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        OAuthApiConnection connection = mock(OAuthApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCurrentUser()).thenReturn(username);
+
         command.doPost(request, response);
 
+        verify(connectionManager, times(1)).login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret);
         assertLogin();
 
         Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues());
@@ -278,19 +285,26 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testOwnerOnlyConsumerLoginWithCookies() throws Exception {
-        OAuthApiConnection connection = mock(OAuthApiConnection.class);
-        whenNew(OAuthApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         Cookie consumerTokenCookie = new Cookie(apiEndpointPrefix + CONSUMER_TOKEN, consumerToken);
         Cookie consumerSecretCookie = new Cookie(apiEndpointPrefix + CONSUMER_SECRET, consumerSecret);
         Cookie accessTokenCookie = new Cookie(apiEndpointPrefix + ACCESS_TOKEN, accessToken);
         Cookie accessSecretCookie = new Cookie(apiEndpointPrefix + ACCESS_SECRET, accessSecret);
-        when(request.getCookies()).thenReturn(new Cookie[]{consumerTokenCookie, consumerSecretCookie, accessTokenCookie, accessSecretCookie});
+        when(request.getCookies())
+                .thenReturn(new Cookie[] { consumerTokenCookie, consumerSecretCookie, accessTokenCookie, accessSecretCookie });
+
+        when(connectionManager.login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        OAuthApiConnection connection = mock(OAuthApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCurrentUser()).thenReturn(username);
+
         command.doPost(request, response);
 
+        verify(connectionManager, times(1)).login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret);
+
         assertLogin();
 
         Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues());
@@ -304,9 +318,6 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testCookieEncoding() throws Exception {
-        OAuthApiConnection connection = mock(OAuthApiConnection.class);
-        whenNew(OAuthApiConnection.class).withAnyArguments().thenReturn(connection);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter("remember-credentials")).thenReturn("on");
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
@@ -316,6 +327,14 @@ public class LoginCommandTest extends CommandTest {
         when(request.getParameter(ACCESS_SECRET)).thenReturn(accessSecret);
         when(request.getCookies()).thenReturn(makeRequestCookies());
 
+        when(connectionManager.login(apiEndpoint, "malformed consumer token \r\n %?", consumerSecret, accessToken, accessSecret))
+                .thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        OAuthApiConnection connection = mock(OAuthApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCurrentUser()).thenReturn(username);
+
         command.doPost(request, response);
 
         Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues());
@@ -325,43 +344,47 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testCookieDecoding() throws Exception {
-        ConnectionManager manager = mock(ConnectionManager.class);
-        given(ConnectionManager.getInstance()).willReturn(manager);
-
-        OAuthApiConnection connection = mock(OAuthApiConnection.class);
-        whenNew(OAuthApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         Cookie consumerTokenCookie = new Cookie(apiEndpointPrefix + CONSUMER_TOKEN, "malformed+consumer+token+%0D%0A+%25%3F");
         Cookie consumerSecretCookie = new Cookie(apiEndpointPrefix + CONSUMER_SECRET, consumerSecret);
         Cookie accessTokenCookie = new Cookie(apiEndpointPrefix + ACCESS_TOKEN, accessToken);
         Cookie accessSecretCookie = new Cookie(apiEndpointPrefix + ACCESS_SECRET, accessSecret);
-        when(request.getCookies()).thenReturn(new Cookie[]{consumerTokenCookie, consumerSecretCookie, accessTokenCookie, accessSecretCookie});
+        when(request.getCookies())
+                .thenReturn(new Cookie[] { consumerTokenCookie, consumerSecretCookie, accessTokenCookie, accessSecretCookie });
+
+        when(connectionManager.login(apiEndpoint, "malformed consumer token \r\n %?", consumerSecret, accessToken, accessSecret))
+                .thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+        OAuthApiConnection connection = mock(OAuthApiConnection.class);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(connection);
+        when(connection.getCurrentUser()).thenReturn(username);
 
         command.doPost(request, response);
 
-        verify(manager).login(apiEndpoint, "malformed consumer token \r\n %?", consumerSecret, accessToken, accessSecret);
+        verify(connectionManager).login(apiEndpoint, "malformed consumer token \r\n %?", consumerSecret, accessToken, accessSecret);
     }
 
     @Test
     public void testLogout() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-        when(connection.getCookies()).thenReturn(makeResponseCookies());
 
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         when(request.getParameter(USERNAME)).thenReturn(username);
         when(request.getParameter(PASSWORD)).thenReturn(password);
 
+        when(connectionManager.login(apiEndpoint, username, password)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+
         // login first
         command.doPost(request, response);
 
         int loginCookiesSize = cookieCaptor.getAllValues().size();
 
+        verify(connectionManager, times(1)).login(apiEndpoint, username, password);
+
         assertLogin();
 
         // logout
@@ -370,12 +393,18 @@ public class LoginCommandTest extends CommandTest {
         StringWriter logoutWriter = new StringWriter();
         when(response.getWriter()).thenReturn(new PrintWriter(logoutWriter));
 
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(false);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(null);
+
         command.doPost(request, response);
 
-        assertFalse(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
-        assertEqualAsJson("{\"logged_in\":false,\"username\":null, \"mediawiki_api_endpoint\":\"" + apiEndpoint + "\"}", logoutWriter.toString());
+        verify(connectionManager).logout(apiEndpoint);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(false);
+        assertEqualAsJson("{\"logged_in\":false,\"username\":null, \"mediawiki_api_endpoint\":\"" + apiEndpoint + "\"}",
+                logoutWriter.toString());
 
-        Map<String, Cookie> cookies = getCookieMap(cookieCaptor.getAllValues().subList(loginCookiesSize, cookieCaptor.getAllValues().size()));
+        Map<String, Cookie> cookies = getCookieMap(
+                cookieCaptor.getAllValues().subList(loginCookiesSize, cookieCaptor.getAllValues().size()));
         cookieMap.forEach((key, value) -> assertCookieEquals(cookies.get(apiEndpointPrefix + WIKIBASE_COOKIE_PREFIX + key), "", 0));
         assertCookieEquals(cookies.get(apiEndpointPrefix + USERNAME), "", 0);
         assertCookieEquals(cookies.get(apiEndpointPrefix + CONSUMER_TOKEN), "", 0);
@@ -386,46 +415,43 @@ public class LoginCommandTest extends CommandTest {
 
     @Test
     public void testUsernamePasswordLoginFailed() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        doThrow(new LoginFailedException("login failed")).when(connection).login(username, password);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         // we don't check the username/password here
         when(request.getParameter(USERNAME)).thenReturn(username);
         when(request.getParameter(PASSWORD)).thenReturn(password);
 
+        when(connectionManager.login(apiEndpoint, username, password)).thenReturn(false);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(false);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(null);
+
         // login first
         command.doPost(request, response);
 
-        verify(connection).login(username, password);
-        assertFalse(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
+        verify(connectionManager).login(apiEndpoint, username, password);
     }
 
     @Test
     public void testUsernamePasswordWithCookiesLoginFailed() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        given(ConnectionManager.convertToBasicApiConnection(anyMap())).willReturn(connection);
-        doThrow(new AssertUserFailedException("assert user login failed")).when(connection).checkCredentials();
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         // we don't check the username/password here
         when(request.getCookies()).thenReturn(makeRequestCookies());
 
+        when(connectionManager.login(eq(apiEndpoint), eq(username), Mockito.<List<Cookie>> any())).thenReturn(false);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(false);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(null);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(null);
+
         // login first
         command.doPost(request, response);
 
-        verify(connection).checkCredentials();
+        verify(connectionManager).login(eq(apiEndpoint), eq(username), Mockito.<List<Cookie>> any());
         assertFalse(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
     }
 
     @Test
     public void testOwnerOnlyConsumerLoginFailed() throws Exception {
-        OAuthApiConnection connection = mock(OAuthApiConnection.class);
-        whenNew(OAuthApiConnection.class).withAnyArguments().thenReturn(connection);
-        doThrow(new AssertUserFailedException("assert user login failed")).when(connection).checkCredentials();
 
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
@@ -434,103 +460,40 @@ public class LoginCommandTest extends CommandTest {
         when(request.getParameter(ACCESS_TOKEN)).thenReturn(accessToken);
         when(request.getParameter(ACCESS_SECRET)).thenReturn(accessSecret);
 
+        when(connectionManager.login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret)).thenReturn(false);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(false);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(null);
+        when(connectionManager.getConnection(apiEndpoint)).thenReturn(null);
+
         command.doPost(request, response);
 
-        verify(connection).checkCredentials();
-        assertFalse(connection.isLoggedIn());
+        verify(connectionManager).login(apiEndpoint, consumerToken, consumerSecret, accessToken, accessSecret);
     }
 
     @Test
     public void testLogoutFailed() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
         when(request.getParameter(USERNAME)).thenReturn(username);
         when(request.getParameter(PASSWORD)).thenReturn(password);
 
+        when(connectionManager.login(apiEndpoint, username, password)).thenReturn(true);
+        when(connectionManager.isLoggedIn(apiEndpoint)).thenReturn(true);
+        when(connectionManager.getUsername(apiEndpoint)).thenReturn(username);
+
         // login first
         command.doPost(request, response);
 
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
+        verify(connectionManager).login(apiEndpoint, username, password);
 
         // logout
         when(request.getParameter("logout")).thenReturn("true");
-        doThrow(new MediaWikiApiErrorException("", "")).when(connection).logout();
+
         command.doPost(request, response);
 
         // still logged in
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
-    }
-
-    @Test
-    public void testLogoutFailedBecauseCredentialsExpired() throws Exception {
-        // if our credentials expire and we try to log out,
-        // we should consider that the logout succeeded.
-        // Workaround for https://github.com/Wikidata/Wikidata-Toolkit/issues/511
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
-        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-        when(request.getParameter(API_ENDPOINT)).thenReturn(apiEndpoint);
-        when(request.getParameter(USERNAME)).thenReturn(username);
-        when(request.getParameter(PASSWORD)).thenReturn(password);
-
-        // login first
-        command.doPost(request, response);
-
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
-
-        // logout
-        when(request.getParameter("logout")).thenReturn("true");
-        doThrow(new MediaWikiApiErrorException("assertuserfailed", "No longer logged in")).when(connection).logout();
-        command.doPost(request, response);
-
-        // not logged in anymore
-        assertFalse(ConnectionManager.getInstance().isLoggedIn(apiEndpoint));
-    }
-
-    @Test
-    public void testMultipleConnections() throws Exception {
-        BasicApiConnection connection = mock(BasicApiConnection.class);
-        whenNew(BasicApiConnection.class).withAnyArguments().thenReturn(connection);
-        when(connection.getCurrentUser()).thenReturn(username);
-
-        String wikibase1 = "https://www.wikibase1.org/w/api.php";
-        String wikibase2 = "https://www.wikibase2.org/w/api.php";
-
-        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-        when(request.getParameter(USERNAME)).thenReturn(username);
-        when(request.getParameter(PASSWORD)).thenReturn(password);
-
-        // login to one endpoint first
-        when(request.getParameter(API_ENDPOINT)).thenReturn(wikibase1);
-        command.doPost(request, response);
-
-        // not logged in to another endpoint
-        assertFalse(ConnectionManager.getInstance().isLoggedIn(wikibase2));
-
-        // login to another endpoint
-        when(request.getParameter(API_ENDPOINT)).thenReturn(wikibase2);
-        command.doPost(request, response);
-
-        // logged in to both endpoints
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(wikibase1));
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(wikibase2));
-
-        // logout from the first endpoint
-        when(request.getParameter("logout")).thenReturn("true");
-        when(request.getParameter(API_ENDPOINT)).thenReturn(wikibase1);
-        command.doPost(request, response);
-
-        // logged out from the first endpoint
-        assertFalse(ConnectionManager.getInstance().isLoggedIn(wikibase1));
-
-        // still logged in to another endpoint
-        assertTrue(ConnectionManager.getInstance().isLoggedIn(wikibase2));
+        verify(connectionManager).logout(apiEndpoint);
+        assertLogin();
     }
 
     private static Cookie[] makeRequestCookies() {
@@ -567,7 +530,7 @@ public class LoginCommandTest extends CommandTest {
         assertEquals(removeCRLF("a\rb\nc\r\n\r\nd"), "abcd");
         assertEquals(removeCRLF(null), "");
     }
-    
+
     @Test
     public void testSanitizeCookieKey() {
         assertEquals(sanitizeCookieKey("https://www.wikidata.org/"), "https---www.wikidata.org-");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
index cef251fe3..494438676 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
@@ -21,18 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.commands;
 
 import static org.mockito.Mockito.when;
 import static org.openrefine.wikidata.testing.TestingData.jsonFromFile;
-import org.openrefine.wikidata.utils.EntityCache;
 import static org.testng.Assert.assertEquals;
 
-import org.openrefine.wikidata.qa.EditInspector;
-import org.openrefine.wikidata.qa.ConstraintFetcher;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import org.openrefine.wikidata.utils.EntityCache;
 import org.openrefine.wikidata.utils.EntityCacheStub;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -40,23 +42,22 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.util.ParsingUtilities;
 
-import javax.servlet.ServletException;
-import java.io.IOException;
-
-@PrepareForTest({EditInspector.class, EntityCache.class})
 public class PreviewWikibaseSchemaCommandTest extends SchemaCommandTest {
 
     @BeforeMethod
     public void SetUp() {
         command = new PreviewWikibaseSchemaCommand();
+        EntityCacheStub entityCacheStub = new EntityCacheStub();
+        EntityCache.setEntityCache("http://www.wikidata.org/entity/", entityCacheStub);
+    }
+
+    @AfterMethod
+    public void tearDown() {
+        EntityCache.removeEntityCache("http://www.wikidata.org/entity/");
     }
 
     @Test
     public void testValidSchema() throws Exception {
-        EntityCacheStub entityCacheStub = new EntityCacheStub();
-        ConstraintFetcher fetcher = new ConstraintFetcher(entityCacheStub, "P2302");
-        PowerMockito.whenNew(ConstraintFetcher.class).withAnyArguments().thenReturn(fetcher);
-        PowerMockito.whenNew(EntityCache.class).withAnyArguments().thenReturn(entityCacheStub);
 
         String schemaJson = jsonFromFile("schema/inception.json");
         String manifestJson = jsonFromFile("manifest/wikidata-manifest-v1.0.json");
@@ -89,6 +90,7 @@ public class PreviewWikibaseSchemaCommandTest extends SchemaCommandTest {
 
         command.doPost(request, response);
 
-        assertEquals(writer.toString(), "{\"code\":\"error\",\"message\":\"Wikibase manifest could not be parsed. Error message: invalid manifest format\"}");
+        assertEquals(writer.toString(),
+                "{\"code\":\"error\",\"message\":\"Wikibase manifest could not be parsed. Error message: invalid manifest format\"}");
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
index 14fa3ac90..5036486c6 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.commands;
 
 import static org.mockito.Mockito.when;
@@ -47,8 +48,8 @@ public class SaveWikibaseSchemaCommandTest extends SchemaCommandTest {
     @Test
     public void testValidSchema()
             throws ServletException, IOException {
-    	when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-    	
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+
         String schemaJson = jsonFromFile("schema/inception.json").toString();
         when(request.getParameter("schema")).thenReturn(schemaJson);
 
@@ -56,26 +57,26 @@ public class SaveWikibaseSchemaCommandTest extends SchemaCommandTest {
 
         assertTrue(writer.toString().contains("\"ok\""));
     }
-    
+
     @Test
     public void testInvalidSchema() throws ServletException, IOException {
-    	when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-    	
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+
         String schemaJson = "{\"itemDocuments\":[{\"statementGroups\":[{\"statements\":[]}],"
-                +"\"nameDescs\":[]}],\"siteIri\":\"http://www.wikidata.org/entity/\"}";
-        
+                + "\"nameDescs\":[]}],\"siteIri\":\"http://www.wikidata.org/entity/\"}";
+
         when(request.getParameter("schema")).thenReturn(schemaJson);
         command.doPost(request, response);
-        
+
         assertTrue(writer.toString().contains("\"error\""));
     }
-    
+
     @Test
     public void testCsrfProtection() throws ServletException, IOException {
-    	String schemaJson = jsonFromFile("schema/inception.json").toString();
+        String schemaJson = jsonFromFile("schema/inception.json").toString();
         when(request.getParameter("schema")).thenReturn(schemaJson);
-        
-    	command.doPost(request, response);
-    	TestUtils.assertEqualAsJson("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", writer.toString());
+
+        command.doPost(request, response);
+        TestUtils.assertEqualAsJson("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", writer.toString());
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java
index 6fbb9f57d..76c011b62 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.commands;
 
 import static org.mockito.Mockito.when;
@@ -40,8 +41,8 @@ public abstract class SchemaCommandTest extends CommandTest {
     @Test
     public void testNoSchema()
             throws ServletException, IOException {
-    	when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-    	
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+
         command.doPost(request, response);
 
         assertEquals(writer.toString(), "{\"code\":\"error\",\"message\":\"No Wikibase schema provided.\"}");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java
index 8246801d9..66f5fd4f7 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.editing;
 
 import static org.mockito.Mockito.mock;
@@ -40,7 +41,7 @@ import java.util.stream.Collectors;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.testing.WikidataRefineTest;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
@@ -48,7 +49,13 @@ import org.wikidata.wdtk.datamodel.helpers.ItemDocumentBuilder;
 import org.wikidata.wdtk.datamodel.interfaces.EntityDocument;
 import org.wikidata.wdtk.datamodel.interfaces.ItemDocument;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoDocument;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
+import org.wikidata.wdtk.datamodel.interfaces.Statement;
+import org.wikidata.wdtk.datamodel.interfaces.StatementGroup;
+import org.wikidata.wdtk.datamodel.interfaces.StatementUpdate;
+import org.wikidata.wdtk.datamodel.interfaces.TermUpdate;
 import org.wikidata.wdtk.wikibaseapi.WikibaseDataEditor;
 import org.wikidata.wdtk.wikibaseapi.WikibaseDataFetcher;
 import org.wikidata.wdtk.wikibaseapi.apierrors.MediaWikiApiErrorException;
@@ -67,7 +74,7 @@ public class EditBatchProcessorTest extends WikidataRefineTest {
         fetcher = mock(WikibaseDataFetcher.class);
         editor = mock(WikibaseDataEditor.class);
         editor.disableEditing(); // just in case we got mocking wrong…
-        library = new NewItemLibrary();
+        library = new NewItemLibrary();// new items created in the test
         tags = Arrays.asList("my-tag");
     }
 
@@ -75,11 +82,11 @@ public class EditBatchProcessorTest extends WikidataRefineTest {
     public void testNewItem()
             throws InterruptedException, MediaWikiApiErrorException, IOException {
         List<TermedStatementEntityUpdate> batch = new ArrayList<>();
-        batch.add(new ItemUpdateBuilder(TestingData.existingId)
+        batch.add(new TermedStatementEntityUpdateBuilder(TestingData.existingId)
                 .addAlias(Datamodel.makeMonolingualTextValue("my new alias", "en"))
                 .addStatement(TestingData.generateStatement(TestingData.existingId, TestingData.newIdA)).build());
         MonolingualTextValue label = Datamodel.makeMonolingualTextValue("better label", "en");
-        batch.add(new ItemUpdateBuilder(TestingData.newIdA).addAlias(label).build());
+        batch.add(new TermedStatementEntityUpdateBuilder(TestingData.newIdA).addAlias(label).build());
 
         // Plan expected edits
         ItemDocument existingItem = ItemDocumentBuilder.forItemId(TestingData.existingId)
@@ -123,7 +130,7 @@ public class EditBatchProcessorTest extends WikidataRefineTest {
         List<ItemIdValue> qids = ids.stream().map(e -> Datamodel.makeWikidataItemIdValue(e))
                 .collect(Collectors.toList());
         List<TermedStatementEntityUpdate> batch = qids.stream()
-                .map(qid -> new ItemUpdateBuilder(qid).addDescription(description, true).build())
+                .map(qid -> new TermedStatementEntityUpdateBuilder(qid).addDescription(description, true).build())
                 .collect(Collectors.toList());
 
         int batchSize = 50;
@@ -152,9 +159,60 @@ public class EditBatchProcessorTest extends WikidataRefineTest {
         verify(fetcher, times(1)).getEntityDocuments(toQids(firstBatch));
         verify(fetcher, times(1)).getEntityDocuments(toQids(secondBatch));
         for (ItemDocument doc : fullBatch) {
-            verify(editor, times(1)).updateTermsStatements(doc, Collections.emptyList(),
-                    Collections.singletonList(description), Collections.emptyList(), Collections.emptyList(),
-                    Collections.emptyList(), Collections.emptyList(), summary, tags);
+            verify(editor, times(1)).editEntityDocument(Datamodel.makeItemUpdate(doc.getEntityId(),
+                    doc.getRevisionId(), Datamodel.makeTermUpdate(Collections.emptyList(), Collections.emptyList()),
+                    Datamodel.makeTermUpdate(Collections.singletonList(description), Collections.emptyList()),
+                    Collections.emptyMap(),
+                    Datamodel.makeStatementUpdate(Collections.emptyList(), Collections.emptyList(), Collections.emptyList()),
+                    Collections.emptyList(), Collections.emptyList()), false, summary, tags);
+        }
+    }
+
+    @Test
+    public void testMultipleBatchesMediaInfo()
+            throws MediaWikiApiErrorException, InterruptedException, IOException {
+        // Prepare test data
+        MonolingualTextValue label = Datamodel.makeMonolingualTextValue("village in Nepal", "en");
+        List<MonolingualTextValue> labels = Collections.singletonList(label);
+        TermUpdate labelsUpdate = Datamodel.makeTermUpdate(labels, Collections.emptyList());
+        List<String> ids = new ArrayList<>();
+        for (int i = 124; i < 190; i++) {
+            ids.add("M" + String.valueOf(i));
+        }
+        List<MediaInfoIdValue> mids = ids.stream().map(e -> Datamodel.makeWikimediaCommonsMediaInfoIdValue(e))
+                .collect(Collectors.toList());
+        List<TermedStatementEntityUpdate> batch = mids.stream()
+                .map(mid -> new TermedStatementEntityUpdateBuilder(mid).addLabel(label, false).build())
+                .collect(Collectors.toList());
+
+        int batchSize = 50;
+        List<MediaInfoDocument> fullBatch = mids.stream()
+                .map(mid -> Datamodel.makeMediaInfoDocument(mid)).collect(Collectors.toList());
+        List<MediaInfoDocument> firstBatch = fullBatch.subList(0, batchSize);
+        List<MediaInfoDocument> secondBatch = fullBatch.subList(batchSize, fullBatch.size());
+
+        when(fetcher.getEntityDocuments(toMids(firstBatch))).thenReturn(toMapMediaInfo(firstBatch));
+        when(fetcher.getEntityDocuments(toMids(secondBatch))).thenReturn(toMapMediaInfo(secondBatch));
+
+        // Run edits
+        EditBatchProcessor processor = new EditBatchProcessor(fetcher, editor, batch, library, summary, maxlag, tags, batchSize);
+        assertEquals(0, processor.progress());
+        for (int i = 124; i < 190; i++) {
+            assertEquals(processor.remainingEdits(), 190 - i);
+            processor.performEdit();
+        }
+        assertEquals(0, processor.remainingEdits());
+        assertEquals(100, processor.progress());
+
+        // Check result
+        assertEquals(new NewItemLibrary(), library);
+        verify(fetcher, times(1)).getEntityDocuments(toMids(firstBatch));
+        verify(fetcher, times(1)).getEntityDocuments(toMids(secondBatch));
+        for (MediaInfoDocument doc : fullBatch) {
+            StatementUpdate statementUpdate = Datamodel.makeStatementUpdate(Collections.emptyList(), Collections.emptyList(),
+                    Collections.emptyList());
+            verify(editor, times(1)).editEntityDocument(Datamodel.makeMediaInfoUpdate((MediaInfoIdValue) doc.getEntityId(),
+                    doc.getRevisionId(), labelsUpdate, statementUpdate), false, summary, tags);
         }
     }
 
@@ -165,4 +223,12 @@ public class EditBatchProcessorTest extends WikidataRefineTest {
     private List<String> toQids(List<ItemDocument> docs) {
         return docs.stream().map(doc -> doc.getEntityId().getId()).collect(Collectors.toList());
     }
+
+    private Map<String, EntityDocument> toMapMediaInfo(List<MediaInfoDocument> docs) {
+        return docs.stream().collect(Collectors.toMap(doc -> doc.getEntityId().getId(), doc -> doc));
+    }
+
+    private List<String> toMids(List<MediaInfoDocument> firstBatch) {
+        return firstBatch.stream().map(doc -> doc.getEntityId().getId()).collect(Collectors.toList());
+    }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java
index bdf80d52e..106451310 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.editing;
 
 import static org.testng.Assert.assertEquals;
@@ -59,9 +60,9 @@ public class NewItemLibraryTest extends WikidataRefineTest {
     public void testUpdateReconciledCells() {
         Project project = createCSVProject(TestingData.inceptionWithNewCsv);
         StandardReconConfig config = new StandardReconConfig("http://my.endpoint",
-        		"http://my.schema", "http://my.schema", "Q5", "human", true, Collections.emptyList());
+                "http://my.schema", "http://my.schema", "Q5", "human", true, Collections.emptyList());
         project.columnModel.columns.get(0).setReconConfig(config);
-        
+
         project.rows.get(0).cells.set(0, TestingData.makeNewItemCell(3289L, "University of Ljubljana"));
         project.rows.get(1).cells.set(0, TestingData.makeMatchedCell("Q865528", "University of Warwick"));
         project.rows.get(2).cells.set(0, TestingData.makeNewItemCell(1234L, "new uni"));
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java
index 0853b6bab..21c69398b 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.editing;
 
 import static org.testng.Assert.assertEquals;
@@ -28,7 +29,7 @@ import static org.testng.Assert.assertEquals;
 import org.openrefine.wikidata.schema.exceptions.NewItemNotCreatedYetException;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
@@ -37,125 +38,125 @@ import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;
 
 public class ReconEntityRewriterTest {
 
-	NewItemLibrary library = null;
-	ReconEntityRewriter rewriter = null;
-	ItemIdValue newlyCreated = Datamodel.makeWikidataItemIdValue("Q1234");
-	PropertyIdValue newlyCreatedProperty = Datamodel.makeWikidataPropertyIdValue("P1234");
+    NewItemLibrary library = null;
+    ReconEntityRewriter rewriter = null;
+    ItemIdValue newlyCreated = Datamodel.makeWikidataItemIdValue("Q1234");
+    PropertyIdValue newlyCreatedProperty = Datamodel.makeWikidataPropertyIdValue("P1234");
 
-	@BeforeMethod
-	public void setUp() {
-		library = new NewItemLibrary();
-	}
+    @BeforeMethod
+    public void setUp() {
+        library = new NewItemLibrary();
+    }
 
-	@Test(expectedExceptions = ReconEntityRewriter.MissingEntityIdFound.class)
-	public void testNotCreatedYet() {
-		rewriter = new ReconEntityRewriter(library, TestingData.newIdA);
-		rewriter.copy(TestingData.newIdB);
-	}
+    @Test(expectedExceptions = ReconEntityRewriter.MissingEntityIdFound.class)
+    public void testNotCreatedYet() {
+        rewriter = new ReconEntityRewriter(library, TestingData.newIdA);
+        rewriter.copy(TestingData.newIdB);
+    }
 
-	@Test
-	public void testSuccessfulRewrite() {
-		rewriter = new ReconEntityRewriter(library, TestingData.newIdA);
-		library.setQid(4567L, "Q1234");
-		assertEquals(newlyCreated, rewriter.copy(TestingData.newIdB));
-	}
+    @Test
+    public void testSuccessfulRewrite() {
+        rewriter = new ReconEntityRewriter(library, TestingData.newIdA);
+        library.setQid(4567L, "Q1234");
+        assertEquals(newlyCreated, rewriter.copy(TestingData.newIdB));
+    }
 
-	@Test
-	public void testSubjectNotRewritten() {
-		ItemIdValue subject = TestingData.newIdA;
-		rewriter = new ReconEntityRewriter(library, subject);
-		assertEquals(subject, rewriter.copy(subject));
-	}
+    @Test
+    public void testSubjectNotRewritten() {
+        ItemIdValue subject = TestingData.newIdA;
+        rewriter = new ReconEntityRewriter(library, subject);
+        assertEquals(subject, rewriter.copy(subject));
+    }
 
-	@Test
-	public void testSubjectRewritten() {
-		ItemIdValue subject = TestingData.newIdB;
-		library.setQid(4567L, "Q1234");
-		rewriter = new ReconEntityRewriter(library, subject);
-		assertEquals(newlyCreated, rewriter.copy(subject));
-	}
+    @Test
+    public void testSubjectRewritten() {
+        ItemIdValue subject = TestingData.newIdB;
+        library.setQid(4567L, "Q1234");
+        rewriter = new ReconEntityRewriter(library, subject);
+        assertEquals(newlyCreated, rewriter.copy(subject));
+    }
 
-	@Test
-	public void testMatched() {
-		rewriter = new ReconEntityRewriter(library, TestingData.newIdA);
-		assertEquals(TestingData.matchedId, rewriter.copy(TestingData.matchedId));
-	}
+    @Test
+    public void testMatched() {
+        rewriter = new ReconEntityRewriter(library, TestingData.newIdA);
+        assertEquals(TestingData.matchedId, rewriter.copy(TestingData.matchedId));
+    }
 
-	@Test
-	public void testRewriteCreate() throws NewItemNotCreatedYetException {
-		ItemIdValue subject = TestingData.newIdA;
-		rewriter = new ReconEntityRewriter(library, subject);
-		library.setQid(4567L, "Q1234");
-		TermedStatementEntityUpdate update = new ItemUpdateBuilder(subject)
-				.addStatement(TestingData.generateStatement(subject, TestingData.newIdB))
-				.deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
-				.addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
-		TermedStatementEntityUpdate expected = new ItemUpdateBuilder(subject)
-				.addStatement(TestingData.generateStatement(subject, newlyCreated))
-				.deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
-				.addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		assertEquals(rewritten, expected);
-	}
+    @Test
+    public void testRewriteCreate() throws NewItemNotCreatedYetException {
+        ItemIdValue subject = TestingData.newIdA;
+        rewriter = new ReconEntityRewriter(library, subject);
+        library.setQid(4567L, "Q1234");
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(subject)
+                .addStatement(TestingData.generateStatement(subject, TestingData.newIdB))
+                .deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
+                .addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
+        TermedStatementEntityUpdate expected = new TermedStatementEntityUpdateBuilder(subject)
+                .addStatement(TestingData.generateStatement(subject, newlyCreated))
+                .deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
+                .addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        assertEquals(rewritten, expected);
+    }
 
-	@Test
-	public void testRewriteUpdateOnPreviouslyCreatedEntity() throws NewItemNotCreatedYetException {
-		ItemIdValue subject = TestingData.newIdA;
-		rewriter = new ReconEntityRewriter(library, subject);
-		library.setQid(4567L, "Q1234");
-		TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdB)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
-		TermedStatementEntityUpdate expected = new ItemUpdateBuilder(newlyCreated)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		assertEquals(rewritten, expected);
-	}
+    @Test
+    public void testRewriteUpdateOnPreviouslyCreatedEntity() throws NewItemNotCreatedYetException {
+        ItemIdValue subject = TestingData.newIdA;
+        rewriter = new ReconEntityRewriter(library, subject);
+        library.setQid(4567L, "Q1234");
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdB)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
+        TermedStatementEntityUpdate expected = new TermedStatementEntityUpdateBuilder(newlyCreated)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        assertEquals(rewritten, expected);
+    }
 
-	@Test
-	public void testRewriteUpdateOnExistingEntity() throws NewItemNotCreatedYetException {
-		ItemIdValue subject = TestingData.matchedId;
-		rewriter = new ReconEntityRewriter(library, subject);
-		library.setQid(4567L, "Q1234");
-		TermedStatementEntityUpdate update = new ItemUpdateBuilder(subject)
-				.addStatement(TestingData.generateStatement(subject, TestingData.newIdB))
-				.deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
-				.addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
-		TermedStatementEntityUpdate expected = new ItemUpdateBuilder(subject)
-				.addStatement(TestingData.generateStatement(subject, newlyCreated))
-				.deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
-				.addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		assertEquals(rewritten, expected);
-	}
+    @Test
+    public void testRewriteUpdateOnExistingEntity() throws NewItemNotCreatedYetException {
+        ItemIdValue subject = TestingData.matchedId;
+        rewriter = new ReconEntityRewriter(library, subject);
+        library.setQid(4567L, "Q1234");
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(subject)
+                .addStatement(TestingData.generateStatement(subject, TestingData.newIdB))
+                .deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
+                .addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
+        TermedStatementEntityUpdate expected = new TermedStatementEntityUpdateBuilder(subject)
+                .addStatement(TestingData.generateStatement(subject, newlyCreated))
+                .deleteStatement(TestingData.generateStatement(subject, TestingData.existingId))
+                .addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        assertEquals(rewritten, expected);
+    }
 
-	@Test
-	public void testRewritePropertyUpdateOnExistingEntity() throws NewItemNotCreatedYetException {
-		PropertyIdValue subject = TestingData.matchedPropertyID;
-		rewriter = new ReconEntityRewriter(library, subject);
-		library.setQid(7654L, "P1234");
-		TermedStatementEntityUpdate update = new ItemUpdateBuilder(subject)
-				.addStatement(TestingData.generateStatement(subject, TestingData.newPropertyIdB))
-				.deleteStatement(TestingData.generateStatement(subject, TestingData.existingPropertyId))
-				.addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
-		TermedStatementEntityUpdate expected = new ItemUpdateBuilder(subject)
-				.addStatement(TestingData.generateStatement(subject, newlyCreatedProperty))
-				.deleteStatement(TestingData.generateStatement(subject, TestingData.existingPropertyId))
-				.addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
-				.addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
-				.addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
-		assertEquals(rewritten, expected);
-	}
+    @Test
+    public void testRewritePropertyUpdateOnExistingEntity() throws NewItemNotCreatedYetException {
+        PropertyIdValue subject = TestingData.matchedPropertyID;
+        rewriter = new ReconEntityRewriter(library, subject);
+        library.setQid(7654L, "P1234");
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(subject)
+                .addStatement(TestingData.generateStatement(subject, TestingData.newPropertyIdB))
+                .deleteStatement(TestingData.generateStatement(subject, TestingData.existingPropertyId))
+                .addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        TermedStatementEntityUpdate rewritten = rewriter.rewrite(update);
+        TermedStatementEntityUpdate expected = new TermedStatementEntityUpdateBuilder(subject)
+                .addStatement(TestingData.generateStatement(subject, newlyCreatedProperty))
+                .deleteStatement(TestingData.generateStatement(subject, TestingData.existingPropertyId))
+                .addLabel(Datamodel.makeMonolingualTextValue("label", "de"), true)
+                .addDescription(Datamodel.makeMonolingualTextValue("beschreibung", "de"), false)
+                .addAlias(Datamodel.makeMonolingualTextValue("darstellung", "de")).build();
+        assertEquals(rewritten, expected);
+    }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSSnakPrinterTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSSnakPrinterTest.java
index 4a79bb913..77dcb919f 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSSnakPrinterTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSSnakPrinterTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.exporters;
 
 import org.testng.Assert;
@@ -13,25 +14,25 @@ public class QSSnakPrinterTest {
     private QSSnakPrinter mainPrinter = new QSSnakPrinter(false);
     private PropertyIdValue pid = Datamodel.makeWikidataPropertyIdValue("P123");
     private ItemIdValue qid = Datamodel.makeWikidataItemIdValue("Q456");
-    
+
     @Test
     public void testReferenceValueSnak() {
         Snak snak = Datamodel.makeValueSnak(pid, qid);
         Assert.assertEquals(snak.accept(refPrinter), "\tS123\tQ456");
     }
-    
+
     @Test
     public void testMainValueSnak() {
         Snak snak = Datamodel.makeValueSnak(pid, qid);
         Assert.assertEquals(snak.accept(mainPrinter), "\tP123\tQ456");
     }
-    
+
     @Test
     public void testReferenceNoValueSnak() {
         Snak snak = Datamodel.makeNoValueSnak(pid);
         Assert.assertEquals(snak.accept(refPrinter), "\tS123\tnovalue");
     }
-    
+
     @Test
     public void testMainSomeValueSnak() {
         Snak snak = Datamodel.makeSomeValueSnak(pid);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java
index bd3552b10..4796a59b5 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.exporters;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
index bc1692f79..edb85d6cd 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.exporters;
 
 import static org.testng.Assert.assertEquals;
@@ -35,7 +36,7 @@ import org.openrefine.wikidata.schema.WikibaseSchema;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.testing.WikidataRefineTest;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.*;
@@ -78,7 +79,7 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
     public void testImpossibleScheduling()
             throws IOException {
         Statement sNewAtoNewB = TestingData.generateStatement(newIdA, newIdB);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(newIdA).addStatement(sNewAtoNewB).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(newIdA).addStatement(sNewAtoNewB).build();
 
         assertEquals(QuickStatementsExporter.impossibleSchedulingErrorMessage, export(update));
     }
@@ -86,22 +87,22 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
     @Test
     public void testNameDesc()
             throws IOException {
-    	/**
-    	 * Adding labels and description without overriding is not supported by QS, so
-    	 * we fall back on adding them with overriding.
-    	 */
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(qid1)
+        /**
+         * Adding labels and description without overriding is not supported by QS, so we fall back on adding them with
+         * overriding.
+         */
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(qid1)
                 .addLabel(Datamodel.makeMonolingualTextValue("some label", "en"), true)
                 .addDescription(Datamodel.makeMonolingualTextValue("some description", "en"), true)
                 .build();
 
         assertEquals("Q1377\tLen\t\"some label\"\n" + "Q1377\tDen\t\"some description\"\n", export(update));
     }
-    
+
     @Test
     public void testOptionalNameDesc()
             throws IOException {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(newIdA)
                 .addLabel(Datamodel.makeMonolingualTextValue("my new item", "en"), false)
                 .addDescription(Datamodel.makeMonolingualTextValue("isn't it awesome?", "en"), false)
                 .addAlias(Datamodel.makeMonolingualTextValue("fabitem", "en")).build();
@@ -113,7 +114,8 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
     @Test
     public void testDeleteStatement()
             throws IOException {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(qid1).deleteStatement(TestingData.generateStatement(qid1, qid2))
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(qid1)
+                .deleteStatement(TestingData.generateStatement(qid1, qid2))
                 .build();
 
         assertEquals("- Q1377\tP38\tQ865528\n", export(update));
@@ -129,11 +131,11 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
         Claim claim = Datamodel.makeClaim(qid1, baseStatement.getClaim().getMainSnak(),
                 Collections.singletonList(group));
         Statement statement = Datamodel.makeStatement(claim, Collections.emptyList(), StatementRank.NORMAL, "");
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(qid1).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(qid1).addStatement(statement).build();
 
         assertEquals("Q1377\tP38\tQ865528\tP38\tQ1377\n", export(update));
     }
-    
+
     @Test
     public void testSomeValue()
             throws IOException {
@@ -141,11 +143,11 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
         Claim claim = Datamodel.makeClaim(qid1, Datamodel.makeSomeValueSnak(pid), Collections.emptyList());
         Statement statement = Datamodel.makeStatement(claim, Collections.emptyList(), StatementRank.NORMAL, "");
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(qid1).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(qid1).addStatement(statement).build();
 
         assertEquals("Q1377\tP123\tsomevalue\n", export(update));
     }
-    
+
     @Test
     public void testNoValue()
             throws IOException {
@@ -153,7 +155,7 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
         Claim claim = Datamodel.makeClaim(qid1, Datamodel.makeNoValueSnak(pid), Collections.emptyList());
         Statement statement = Datamodel.makeStatement(claim, Collections.emptyList(), StatementRank.NORMAL, "");
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(qid1).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(qid1).addStatement(statement).build();
 
         assertEquals("Q1377\tP123\tnovalue\n", export(update));
     }
@@ -161,8 +163,7 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
     /**
      * issue #2320
      *
-     * A statement with different references should be duplicated,
-     * but each with a different reference.
+     * A statement with different references should be duplicated, but each with a different reference.
      */
     @Test
     public void testReferences()
@@ -181,7 +182,7 @@ public class QuickStatementsExporterTest extends WikidataRefineTest {
         Reference reference2 = Datamodel.makeReference(Collections.singletonList(group2));
 
         Statement statement = Datamodel.makeStatement(claim, Arrays.asList(reference1, reference2), StatementRank.NORMAL, "");
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(qid1).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(qid1).addStatement(statement).build();
 
         assertEquals("Q1377\tP38\tQ865528\tP38\tQ1377\tS38\tQ865528\n" +
                 "Q1377\tP38\tQ865528\tP38\tQ1377\tS38\tQ1377\n", export(update));
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java
index 35a737d42..80d74e4fe 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/SchemaExporterTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.exporters;
 
 import java.io.IOException;
@@ -12,9 +13,9 @@ import com.google.refine.model.Project;
 import com.google.refine.util.TestUtils;
 
 public class SchemaExporterTest extends WikidataRefineTest {
-	
-	private SchemaExporter exporter = new SchemaExporter();
-	
+
+    private SchemaExporter exporter = new SchemaExporter();
+
     @Test
     public void testNoSchema()
             throws IOException {
@@ -23,7 +24,8 @@ public class SchemaExporterTest extends WikidataRefineTest {
         StringWriter writer = new StringWriter();
         Properties properties = new Properties();
         exporter.export(project, properties, engine, writer);
-        TestUtils.assertEqualAsJson("{\"itemDocuments\":[],\"siteIri\":null,\"mediaWikiApiEndpoint\":null}", writer.toString());
+        TestUtils.assertEqualAsJson("{\"itemDocuments\":[],\"siteIri\":null,\"mediaWikiApiEndpoint\":null,\"entityTypeSiteIRI\":{}}",
+                writer.toString());
     }
 
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/manifests/ManifestTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/manifests/ManifestTest.java
new file mode 100644
index 000000000..3751599a2
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/manifests/ManifestTest.java
@@ -0,0 +1,109 @@
+
+package org.openrefine.wikidata.manifests;
+
+import org.openrefine.wikidata.testing.TestingData;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import static org.testng.AssertJUnit.assertEquals;
+
+public class ManifestTest {
+
+    @Test
+    public void testV1() throws IOException, ManifestException {
+        String json = TestingData.jsonFromFile("manifest/wikidata-manifest-v1.0.json");
+        Manifest manifest = ManifestParser.parse(json);
+        assertEquals("1.0", manifest.getVersion());
+        assertEquals("Wikidata", manifest.getName());
+        assertEquals("https://www.wikidata.org/w/api.php", manifest.getMediaWikiApiEndpoint());
+        assertEquals("https://www.wikidata.org/w/api.php", manifest.getMediaWikiApiEndpoint("item"));
+        assertEquals("http://www.wikidata.org/entity/", manifest.getSiteIri());
+        assertEquals(5, manifest.getMaxlag());
+        assertEquals("P31", manifest.getInstanceOfPid());
+        assertEquals("P279", manifest.getSubclassOfPid());
+        assertEquals("https://wikidata.reconci.link/${lang}/api", manifest.getReconServiceEndpoint());
+        assertEquals("https://wikidata.reconci.link/${lang}/api", manifest.getReconServiceEndpoint(Manifest.ITEM_TYPE));
+        assertNull(manifest.getReconServiceEndpoint(Manifest.MEDIAINFO_TYPE));
+        assertEquals(Arrays.asList(Manifest.ITEM_TYPE, Manifest.PROPERTY_TYPE), manifest.getAvailableEntityTypes());
+        assertEquals("http://www.wikidata.org/entity/", manifest.getEntityTypeSiteIri(Manifest.ITEM_TYPE));
+        assertNull(manifest.getEntityTypeSiteIri(Manifest.MEDIAINFO_TYPE));
+        assertEquals("P2302", manifest.getConstraintsRelatedId("property_constraint_pid"));
+        assertEquals("Q19474404", manifest.getConstraintsRelatedId("single_value_constraint_qid"));
+        assertEquals("([[:toollabs:editgroups/b/OR/${batch_id}|details]])", manifest.getEditGroupsUrlSchema());
+    }
+
+    @Test
+    public void testV2() throws IOException, ManifestException {
+        String json = TestingData.jsonFromFile("manifest/commons-manifest-v2.0.json");
+        Manifest manifest = ManifestParser.parse(json);
+        assertEquals("2.0", manifest.getVersion());
+        assertEquals("Wikimedia Commons", manifest.getName());
+        assertEquals("https://commons.wikimedia.org/w/api.php", manifest.getMediaWikiApiEndpoint());
+        assertEquals("https://www.wikidata.org/w/api.php", manifest.getMediaWikiApiEndpoint("item"));
+        assertEquals("https://commons.wikimedia.org/entity/", manifest.getSiteIri());
+        assertEquals(5, manifest.getMaxlag());
+        assertEquals("P31", manifest.getInstanceOfPid());
+        assertEquals("P279", manifest.getSubclassOfPid());
+        assertEquals("https://commonsreconcile.toolforge.org/${lang}/api", manifest.getReconServiceEndpoint(Manifest.MEDIAINFO_TYPE));
+        assertEquals("https://wikidata.reconci.link/${lang}/api", manifest.getReconServiceEndpoint(Manifest.ITEM_TYPE));
+        assertNull(manifest.getReconServiceEndpoint(Manifest.PROPERTY_TYPE));
+        assertEquals(Arrays.asList(Manifest.ITEM_TYPE, Manifest.PROPERTY_TYPE, Manifest.MEDIAINFO_TYPE),
+                manifest.getAvailableEntityTypes());
+        assertEquals("http://www.wikidata.org/entity/", manifest.getEntityTypeSiteIri(Manifest.ITEM_TYPE));
+        assertEquals("https://commons.wikimedia.org/entity/", manifest.getEntityTypeSiteIri(Manifest.MEDIAINFO_TYPE));
+        assertEquals("P2302", manifest.getConstraintsRelatedId("property_constraint_pid"));
+        assertEquals("([[:toollabs:editgroups-commons/b/OR/${batch_id}|details]])", manifest.getEditGroupsUrlSchema());
+    }
+
+    @Test
+    public void testInvalidManifestFormat() {
+        String invalidJson = "{invalid";
+        try {
+            ManifestParser.parse(invalidJson);
+        } catch (ManifestException e) {
+            assertEquals("invalid manifest format", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testMissingVersion() {
+        String missingVersion = "{\"a\": \"b\"}";
+        try {
+            ManifestParser.parse(missingVersion);
+        } catch (ManifestException e) {
+            assertEquals("invalid manifest format, version is missing", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testInvalidVersion() {
+        String invalidVersion1 = "{\"version\": \"a1.0\"}";
+        try {
+            ManifestParser.parse(invalidVersion1);
+        } catch (ManifestException e) {
+            assertEquals("invalid version: a1.0", e.getMessage());
+        }
+
+        String invalidVersion2 = "{\"version\": \"1.1a\"}";
+        try {
+            ManifestParser.parse(invalidVersion2);
+        } catch (ManifestException e) {
+            assertEquals("invalid version: 1.1a", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testUnsupportedVersion() {
+        String unsupportedVersion = "{\"version\": \"3.0\"}";
+        try {
+            ManifestParser.parse(unsupportedVersion);
+        } catch (ManifestException e) {
+            assertEquals("unsupported manifest version: 3.0", e.getMessage());
+        }
+    }
+
+}
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/manifests/ManifestV1Test.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/manifests/ManifestV1Test.java
deleted file mode 100644
index 4888350c7..000000000
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/manifests/ManifestV1Test.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.openrefine.wikidata.manifests;
-
-import org.openrefine.wikidata.testing.TestingData;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-
-import static org.testng.AssertJUnit.assertEquals;
-
-public class ManifestV1Test {
-
-    @Test
-    public void testGetters() throws IOException, ManifestException {
-        String json = TestingData.jsonFromFile("manifest/wikidata-manifest-v1.0.json");
-        Manifest manifest = ManifestParser.parse(json);
-        assertEquals("1.0", manifest.getVersion());
-        assertEquals("Wikidata", manifest.getName());
-        assertEquals("https://www.wikidata.org/w/api.php", manifest.getMediaWikiApiEndpoint());
-        assertEquals("http://www.wikidata.org/entity/", manifest.getSiteIri());
-        assertEquals(5, manifest.getMaxlag());
-        assertEquals("P31", manifest.getInstanceOfPid());
-        assertEquals("P279", manifest.getSubclassOfPid());
-        assertEquals("https://wikidata.reconci.link/${lang}/api", manifest.getReconServiceEndpoint());
-        assertEquals("P2302", manifest.getConstraintsRelatedId("property_constraint_pid"));
-        assertEquals("Q19474404", manifest.getConstraintsRelatedId("single_value_constraint_qid"));
-        assertEquals("([[:toollabs:editgroups/b/OR/${batch_id}|details]])", manifest.getEditGroupsUrlSchema());
-    }
-
-    @Test
-    public void testInvalidManifestFormat() {
-        String invalidJson = "{invalid";
-        try {
-            ManifestParser.parse(invalidJson);
-        } catch (ManifestException e) {
-            assertEquals("invalid manifest format", e.getMessage());
-        }
-    }
-
-    @Test
-    public void testMissingVersion() {
-        String missingVersion = "{\"a\": \"b\"}";
-        try {
-            ManifestParser.parse(missingVersion);
-        } catch (ManifestException e) {
-            assertEquals("invalid manifest format, version is missing", e.getMessage());
-        }
-    }
-
-    @Test
-    public void testInvalidVersion() {
-        String invalidVersion1 = "{\"version\": \"a1.0\"}";
-        try {
-            ManifestParser.parse(invalidVersion1);
-        } catch (ManifestException e) {
-            assertEquals("invalid version: a1.0", e.getMessage());
-        }
-
-        String invalidVersion2 = "{\"version\": \"1.1a\"}";
-        try {
-            ManifestParser.parse(invalidVersion2);
-        } catch (ManifestException e) {
-            assertEquals("invalid version: 1.1a", e.getMessage());
-        }
-    }
-
-    @Test
-    public void testUnsupportedVersion() {
-        String unsupportedVersion = "{\"version\": \"2.0\"}";
-        try {
-            ManifestParser.parse(unsupportedVersion);
-        } catch (ManifestException e) {
-            assertEquals("unsupported manifest version: 2.0", e.getMessage());
-        }
-    }
-
-}
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java
index ae6987b02..63750efed 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/OperationTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.operations;
 
 import static org.mockito.Mockito.mock;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
index 391ab50b6..37b26f7b2 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.operations;
 
 import static org.testng.Assert.assertEquals;
@@ -55,8 +56,8 @@ public class PerformWikibaseEditsOperationTest extends OperationTest {
             throws Exception {
         return TestingData.jsonFromFile("operations/perform-edits.json");
     }
-    
-    @Test(expectedExceptions=IllegalArgumentException.class)
+
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void testConstructor() {
         new PerformWikibaseEditsOperation(EngineConfig.reconstruct("{}"), "", 5, "");
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
index 13a291c28..7e4c51716 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.operations;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/ConstraintTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/ConstraintTest.java
index 365495886..e5add4082 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/ConstraintTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/ConstraintTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.qa;
 
 import org.testng.Assert;
@@ -47,7 +48,7 @@ public class ConstraintTest {
         SnakGroup qualifier2 = Datamodel.makeSnakGroup(qualifierSnakList2);
         List<SnakGroup> snakGroupList = Arrays.asList(qualifier1, qualifier2);
         PropertyIdValue propertyIdValue = Datamodel.makeWikidataPropertyIdValue("P2302");
-        Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue,itemIdValue);
+        Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, itemIdValue);
         Claim claim = Datamodel.makeClaim(itemIdValue, mainSnak, snakGroupList);
         Reference reference = Datamodel.makeReference(snakGroupList);
         List<Reference> referenceList = Collections.singletonList(reference);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/EditInspectorTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/EditInspectorTest.java
index e0e7fd4aa..6bc132b2e 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/EditInspectorTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/EditInspectorTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.qa;
 
 import org.openrefine.wikidata.manifests.Manifest;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java
index 9306ca3f6..169ca6fa2 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java
index 4ab900164..29f726007 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/SchemaPropertyExtractorTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/SchemaPropertyExtractorTest.java
index a0bd4cbf8..4229bf4d1 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/SchemaPropertyExtractorTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/SchemaPropertyExtractorTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.qa;
 
 import org.openrefine.wikidata.commands.CommandTest;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CalendarScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CalendarScrutinizerTest.java
index 5acb2b254..e30391807 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CalendarScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CalendarScrutinizerTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.testng.annotations.Test;
@@ -6,32 +7,33 @@ import org.wikidata.wdtk.datamodel.interfaces.TimeValue;
 
 public class CalendarScrutinizerTest extends ValueScrutinizerTest {
 
-	@Override
-	public EditScrutinizer getScrutinizer() {
-		return new CalendarScrutinizer();
-	}
-	
+    @Override
+    public EditScrutinizer getScrutinizer() {
+        return new CalendarScrutinizer();
+    }
+
     @Test
     public void testScrutinizeRecentValue() {
-    	scrutinize(Datamodel.makeTimeValue(1978L, (byte)3, (byte)4, (byte)0, (byte)0, (byte)0, 11, TimeValue.CM_GREGORIAN_PRO));
-    	assertNoWarningRaised();
+        scrutinize(Datamodel.makeTimeValue(1978L, (byte) 3, (byte) 4, (byte) 0, (byte) 0, (byte) 0, 11, TimeValue.CM_GREGORIAN_PRO));
+        assertNoWarningRaised();
     }
-    
+
     @Test
     public void testScrutinizeCloseValue() {
-    	scrutinize(Datamodel.makeTimeValue(1582L, (byte)10, (byte)17, (byte)0, (byte)0, (byte)0, 11, TimeValue.CM_GREGORIAN_PRO));
-    	assertNoWarningRaised();
+        scrutinize(Datamodel.makeTimeValue(1582L, (byte) 10, (byte) 17, (byte) 0, (byte) 0, (byte) 0, 11, TimeValue.CM_GREGORIAN_PRO));
+        assertNoWarningRaised();
     }
-    
+
     @Test
     public void testScrutinizeEarlyYear() {
-    	scrutinize(Datamodel.makeTimeValue(1400L, (byte)1, (byte)1, (byte)0, (byte)0, (byte)0, (byte)9, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO));
-    	assertNoWarningRaised();
+        scrutinize(Datamodel.makeTimeValue(1400L, (byte) 1, (byte) 1, (byte) 0, (byte) 0, (byte) 0, (byte) 9, 0, 0, 0,
+                TimeValue.CM_GREGORIAN_PRO));
+        assertNoWarningRaised();
     }
-    
+
     @Test
     public void testScrutinizeEarlyDay() {
-    	scrutinize(Datamodel.makeTimeValue(1440L, (byte)10, (byte)17, (byte)0, (byte)0, (byte)0, 11, TimeValue.CM_GREGORIAN_PRO));
-    	assertWarningsRaised(CalendarScrutinizer.earlyGregorianDateType);
+        scrutinize(Datamodel.makeTimeValue(1440L, (byte) 10, (byte) 17, (byte) 0, (byte) 0, (byte) 0, 11, TimeValue.CM_GREGORIAN_PRO));
+        assertWarningsRaised(CalendarScrutinizer.earlyGregorianDateType);
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CommonDescriptionScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CommonDescriptionScrutinizerTest.java
index ad7ac5521..890a1bc86 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CommonDescriptionScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/CommonDescriptionScrutinizerTest.java
@@ -1,8 +1,9 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 
@@ -16,7 +17,7 @@ public class CommonDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testGoodDesc() {
         String description = "good description";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
         scrutinize(update);
@@ -29,7 +30,7 @@ public class CommonDescriptionScrutinizerTest extends ScrutinizerTest {
                 + "long description long description long description long description "
                 + "long description long description long description long description "
                 + "long description long description long description long description";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
         scrutinize(update);
@@ -39,7 +40,7 @@ public class CommonDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testIdenticalWithLabel() {
         String description = "identical with label";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .addLabel(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
@@ -50,7 +51,7 @@ public class CommonDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testIdenticalWithLabel1() {
         String description = "identical with label";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .addLabel(Datamodel.makeMonolingualTextValue("bonjour", "fr"), true)
                 .build();
@@ -64,7 +65,7 @@ public class CommonDescriptionScrutinizerTest extends ScrutinizerTest {
                 + "long description long description long description long description "
                 + "long description long description long description long description "
                 + "long description long description long description long description";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .addLabel(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ConflictsWithScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ConflictsWithScrutinizerTest.java
index 4ed41b1a4..3509947c4 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ConflictsWithScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ConflictsWithScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -33,9 +34,9 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
     public static PropertyIdValue conflictsWithPid = Datamodel.makeWikidataPropertyIdValue("P2002");
     public static Value conflictsWithValue = Datamodel.makeWikidataItemIdValue("Q36322");
     public static PropertyIdValue propertyWithConflictsPid1 = Datamodel.makeWikidataPropertyIdValue("P31");
-    public static Value conflictingValue1  = Datamodel.makeWikidataItemIdValue("Q4167836");
+    public static Value conflictingValue1 = Datamodel.makeWikidataItemIdValue("Q4167836");
     public static PropertyIdValue propertyWithConflictsPid2 = Datamodel.makeWikidataPropertyIdValue("P553");
-    public static Value conflictingValue2  = Datamodel.makeWikidataItemIdValue("Q918");
+    public static Value conflictingValue2 = Datamodel.makeWikidataItemIdValue("Q918");
 
     public static ItemIdValue entityIdValue = Datamodel.makeWikidataItemIdValue(CONFLICTS_WITH_CONSTRAINT_QID);
     public static PropertyIdValue propertyParameterPID = Datamodel.makeWikidataPropertyIdValue(CONFLICTS_WITH_PROPERTY_PID);
@@ -57,10 +58,11 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
         ValueSnak value1 = Datamodel.makeValueSnak(conflictsWithPid, conflictsWithValue);
         ValueSnak value2 = Datamodel.makeValueSnak(propertyWithConflictsPid1, conflictingValue1);
 
-        Statement statement1 = new StatementImpl("P2002", value1,idA);
-        Statement statement2 = new StatementImpl("P31", value2,idA);
+        Statement statement1 = new StatementImpl("P2002", value1, idA);
+        Statement statement2 = new StatementImpl("P31", value2, idA);
 
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         Snak snak1 = Datamodel.makeValueSnak(propertyParameterPID, conflictingPropertyValue1);
         Snak snak2 = Datamodel.makeValueSnak(itemParameterPID, conflictingItemValue1);
@@ -85,9 +87,9 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
 
         ValueSnak value = Datamodel.makeValueSnak(conflictsWithPid, conflictsWithValue);
 
-        Statement statement = new StatementImpl("P2002", value,id);
+        Statement statement = new StatementImpl("P2002", value, id);
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement).build();
 
         Snak snak1 = Datamodel.makeValueSnak(propertyParameterPID, conflictingPropertyValue1);
         Snak snak2 = Datamodel.makeValueSnak(itemParameterPID, conflictingItemValue1);
@@ -113,10 +115,11 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
         ValueSnak value1 = Datamodel.makeValueSnak(conflictsWithPid, conflictsWithValue);
         NoValueSnak value2 = Datamodel.makeNoValueSnak(propertyWithConflictsPid1);
 
-        Statement statement1 = new StatementImpl("P2002", value1,idA);
-        Statement statement2 = new StatementImpl("P31", value2,idA);
+        Statement statement1 = new StatementImpl("P2002", value1, idA);
+        Statement statement2 = new StatementImpl("P31", value2, idA);
 
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         Snak snak1 = Datamodel.makeValueSnak(propertyParameterPID, conflictingPropertyValue1);
         Snak snak2 = Datamodel.makeValueSnak(itemParameterPID, conflictingItemValue1);
@@ -141,9 +144,9 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
 
         ValueSnak valueSnak = Datamodel.makeValueSnak(propertyWithConflictsPid1, conflictingValue1);
 
-        Statement statement = new StatementImpl("P31", valueSnak,idA);
+        Statement statement = new StatementImpl("P31", valueSnak, idA);
 
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = new ArrayList<>();
 
@@ -167,7 +170,8 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
         Statement statement2 = new StatementImpl("P31", value2, idA);
         Statement statement3 = new StatementImpl("P553", value3, idA);
 
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).addStatement(statement3).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .addStatement(statement3).build();
 
         Snak propertySnak1 = Datamodel.makeValueSnak(propertyParameterPID, conflictingPropertyValue1);
         Snak itemSnak1 = Datamodel.makeValueSnak(itemParameterPID, conflictingItemValue1);
@@ -189,4 +193,3 @@ public class ConflictsWithScrutinizerTest extends ScrutinizerTest {
     }
 
 }
-
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DifferenceWithinScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DifferenceWithinScrutinizerTest.java
index 0ec16383d..72a958eb6 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DifferenceWithinScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DifferenceWithinScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -23,7 +24,7 @@ import java.util.List;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class DifferenceWithinScrutinizerTest extends ScrutinizerTest{
+public class DifferenceWithinScrutinizerTest extends ScrutinizerTest {
 
     public static String DIFFERENCE_WITHIN_RANGE_CONSTRAINT_QID = "Q21510854";
     public static String DIFFERENCE_WITHIN_RANGE_CONSTRAINT_PID = "P2306";
@@ -48,13 +49,16 @@ public class DifferenceWithinScrutinizerTest extends ScrutinizerTest{
     @Test
     public void testTrigger() {
         ItemIdValue idA = TestingData.existingId;
-        TimeValue lowerYear = new TimeValueImpl(1800, (byte)10, (byte)15, (byte)0, (byte)0, (byte)0, (byte)11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
-        TimeValue upperYear = new TimeValueImpl(2020, (byte)10, (byte)15, (byte)0, (byte)0, (byte)0, (byte)11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
+        TimeValue lowerYear = new TimeValueImpl(1800, (byte) 10, (byte) 15, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                TimeValue.CM_GREGORIAN_PRO);
+        TimeValue upperYear = new TimeValueImpl(2020, (byte) 10, (byte) 15, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                TimeValue.CM_GREGORIAN_PRO);
         ValueSnak value1 = Datamodel.makeValueSnak(lowerBoundPid, lowerYear);
         ValueSnak value2 = Datamodel.makeValueSnak(upperBoundPid, upperYear);
-        Statement statement1 = new StatementImpl("P569", value1,idA);
-        Statement statement2 = new StatementImpl("P570", value2,idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        Statement statement1 = new StatementImpl("P569", value1, idA);
+        Statement statement2 = new StatementImpl("P570", value2, idA);
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         Snak propertyQualifier = Datamodel.makeValueSnak(propertyParameterPID, lowerBoundPid);
         Snak minValueQualifier = Datamodel.makeValueSnak(minimumValuePID, minValue);
@@ -73,13 +77,16 @@ public class DifferenceWithinScrutinizerTest extends ScrutinizerTest{
     @Test
     public void testNoIssue() {
         ItemIdValue idA = TestingData.existingId;
-        TimeValue lowerYear = new TimeValueImpl(2000, (byte)10, (byte)15, (byte)0, (byte)0, (byte)0, (byte)11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
-        TimeValue upperYear = new TimeValueImpl(2020, (byte)10, (byte)15, (byte)0, (byte)0, (byte)0, (byte)11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
+        TimeValue lowerYear = new TimeValueImpl(2000, (byte) 10, (byte) 15, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                TimeValue.CM_GREGORIAN_PRO);
+        TimeValue upperYear = new TimeValueImpl(2020, (byte) 10, (byte) 15, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                TimeValue.CM_GREGORIAN_PRO);
         ValueSnak value1 = Datamodel.makeValueSnak(lowerBoundPid, lowerYear);
         ValueSnak value2 = Datamodel.makeValueSnak(upperBoundPid, upperYear);
-        Statement statement1 = new StatementImpl("P569", value1,idA);
-        Statement statement2 = new StatementImpl("P570", value2,idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        Statement statement1 = new StatementImpl("P569", value1, idA);
+        Statement statement2 = new StatementImpl("P570", value2, idA);
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         Snak propertyQualifier = Datamodel.makeValueSnak(propertyParameterPID, lowerBoundPid);
         Snak minValueQualifier = Datamodel.makeValueSnak(minimumValuePID, minValue);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DistinctValuesScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DistinctValuesScrutinizerTest.java
index 9ebbbac1b..23db84b29 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DistinctValuesScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/DistinctValuesScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -65,7 +66,8 @@ public class DistinctValuesScrutinizerTest extends StatementScrutinizerTest {
         Statement statement1 = new StatementImpl("P163", mainSnak, idA);
         Statement statement2 = new StatementImpl("P163", mainSnak, idA);
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         List<SnakGroup> constraintQualifiers = new ArrayList<>();
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, constraintQualifiers);
@@ -86,7 +88,8 @@ public class DistinctValuesScrutinizerTest extends StatementScrutinizerTest {
         Statement statement1 = new StatementImpl("P163", snak1, idA);
         Statement statement2 = new StatementImpl("P163", snak2, idA);
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         List<SnakGroup> constraintQualifiers = new ArrayList<>();
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, constraintQualifiers);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EnglishDescriptionScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EnglishDescriptionScrutinizerTest.java
index b4b215cc7..8635491eb 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EnglishDescriptionScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EnglishDescriptionScrutinizerTest.java
@@ -1,8 +1,9 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 
@@ -16,7 +17,7 @@ public class EnglishDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testGoodDesc() {
         String description = "good description";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
         scrutinize(update);
@@ -26,7 +27,7 @@ public class EnglishDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testEndWithPunctuationSign() {
         String description = "description with punctuationSign.";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), false)
                 .build();
         scrutinize(update);
@@ -36,7 +37,7 @@ public class EnglishDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testBeginWithUppercase() {
         String description = "Begin with uppercase";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
         scrutinize(update);
@@ -46,7 +47,7 @@ public class EnglishDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testBeginWithArticle() {
         String description = "an article test";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), false)
                 .build();
         scrutinize(update);
@@ -56,7 +57,7 @@ public class EnglishDescriptionScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testAwfulDesc() {
         String description = "An awful description.";
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addDescription(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .addLabel(Datamodel.makeMonolingualTextValue(description, "en"), true)
                 .build();
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EntityTypeScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EntityTypeScrutinizerTest.java
index 9e4b009ca..f7946604e 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EntityTypeScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/EntityTypeScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -35,13 +36,11 @@ public class EntityTypeScrutinizerTest extends StatementScrutinizerTest {
     public static Value itemValue = Datamodel.makeWikidataItemIdValue("Q29934218");
     public static Value allowedValue = Datamodel.makeWikidataItemIdValue(WIKIBASE_ITEM_QID);
 
-
-
     @Override
     public EditScrutinizer getScrutinizer() {
         return new EntityTypeScrutinizer();
     }
-    
+
     @Test
     public void testAllowed() {
         ItemIdValue idA = TestingData.existingId;
@@ -49,7 +48,7 @@ public class EntityTypeScrutinizerTest extends StatementScrutinizerTest {
         ValueSnak mainValueSnak = Datamodel.makeValueSnak(propertyIdValue, propertyValue);
         Statement statement = new StatementImpl("P2302", mainValueSnak, idA);
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(itemParameterPID, allowedValue);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -58,7 +57,7 @@ public class EntityTypeScrutinizerTest extends StatementScrutinizerTest {
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, constraintQualifiers);
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
-        when(fetcher.getConstraintsByType(propertyIdValue,ALLOWED_ENTITY_TYPES_QID)).thenReturn(constraintDefinitions);
+        when(fetcher.getConstraintsByType(propertyIdValue, ALLOWED_ENTITY_TYPES_QID)).thenReturn(constraintDefinitions);
         setFetcher(fetcher);
 
         scrutinize(update);
@@ -72,7 +71,7 @@ public class EntityTypeScrutinizerTest extends StatementScrutinizerTest {
         ValueSnak mainValueSnak = Datamodel.makeValueSnak(propertyIdValue, propertyValue);
         Statement statement = new StatementImpl("P2302", mainValueSnak, idA);
 
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(itemParameterPID, itemValue);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -81,7 +80,7 @@ public class EntityTypeScrutinizerTest extends StatementScrutinizerTest {
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, constraintQualifiers);
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
-        when(fetcher.getConstraintsByType(propertyIdValue,ALLOWED_ENTITY_TYPES_QID)).thenReturn(constraintDefinitions);
+        when(fetcher.getConstraintsByType(propertyIdValue, ALLOWED_ENTITY_TYPES_QID)).thenReturn(constraintDefinitions);
         setFetcher(fetcher);
 
         scrutinize(update);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/FormatScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/FormatScrutinizerTest.java
index ad6f2c255..8a123a0d7 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/FormatScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/FormatScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -65,13 +66,12 @@ public class FormatScrutinizerTest extends ScrutinizerTest {
         return new FormatScrutinizer();
     }
 
-
     @Test
     public void testTrigger() {
         ItemIdValue idA = TestingData.existingId;
         ValueSnak value = Datamodel.makeValueSnak(propertyIdValue, noMatchValue);
         Statement statement = new StatementImpl("P18", value, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = generateFormatConstraint(regularExpression);
 
@@ -87,7 +87,7 @@ public class FormatScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         ValueSnak value = Datamodel.makeValueSnak(propertyIdValue, completeMatchValue);
         Statement statement = new StatementImpl("P18", value, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = generateFormatConstraint(regularExpression);
 
@@ -103,7 +103,7 @@ public class FormatScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         ValueSnak value = Datamodel.makeValueSnak(propertyIdValue, incompleteMatchValue);
         Statement statement = new StatementImpl("P18", value, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = generateFormatConstraint(regularExpression);
 
@@ -113,14 +113,14 @@ public class FormatScrutinizerTest extends ScrutinizerTest {
         scrutinize(updateA);
         assertWarningsRaised(FormatScrutinizer.type);
     }
-    
+
     @Test
     public void testInvalidRegex() {
         ItemIdValue idA = TestingData.existingId;
         ValueSnak value = Datamodel.makeValueSnak(propertyIdValue, incompleteMatchValue);
         Statement statement = new StatementImpl("P18", value, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
-        
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
+
         List<Statement> constraintDefinitions = generateFormatConstraint(invalidRegularExpression);
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -129,7 +129,7 @@ public class FormatScrutinizerTest extends ScrutinizerTest {
         scrutinize(updateA);
         assertNoWarningRaised();
     }
-    
+
     protected List<Statement> generateFormatConstraint(String regex) {
         Snak qualifierSnak = Datamodel.makeValueSnak(regularExpressionParameter, Datamodel.makeStringValue(regex));
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/InverseConstraintScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/InverseConstraintScrutinizerTest.java
index b729ff683..315c571ec 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/InverseConstraintScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/InverseConstraintScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -68,7 +69,7 @@ public class InverseConstraintScrutinizerTest extends StatementScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyId, propertyValue);
         Statement statement = new StatementImpl("P25", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(propertyParameter, inversePropertyID);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -88,7 +89,7 @@ public class InverseConstraintScrutinizerTest extends StatementScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(symmetricPropertyID, symmetricPropertyValue);
         Statement statement = new StatementImpl("P3373", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(symmetricPropertyID, symmetricEntityIdValue);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -108,7 +109,7 @@ public class InverseConstraintScrutinizerTest extends StatementScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeSomeValueSnak(propertyId);
         Statement statement = new StatementImpl("P25", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(propertyParameter, inverseEntityIdValue);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ItemRequiresScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ItemRequiresScrutinizerTest.java
index e137349bd..cd3218db7 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ItemRequiresScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ItemRequiresScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -44,7 +45,7 @@ public class ItemRequiresScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, itemValue);
         Statement statement = new StatementImpl("P157", mainSnak, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, requiredValue);
@@ -66,7 +67,8 @@ public class ItemRequiresScrutinizerTest extends ScrutinizerTest {
         Statement statement = new StatementImpl("P157", mainSnak, idA);
         Snak requiredPropertySnak = Datamodel.makeValueSnak(propertyParameterValue, itemValue);
         Statement requiredStatement = new StatementImpl("P1196", requiredPropertySnak, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).addStatement(requiredStatement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement)
+                .addStatement(requiredStatement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, requiredValue);
@@ -88,7 +90,8 @@ public class ItemRequiresScrutinizerTest extends ScrutinizerTest {
         Statement statement = new StatementImpl("P157", mainSnak, idA);
         Snak requiredPropertySnak = Datamodel.makeValueSnak(propertyParameterValue, requiredValue);
         Statement requiredStatement = new StatementImpl("P1196", requiredPropertySnak, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).addStatement(requiredStatement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement)
+                .addStatement(requiredStatement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, requiredValue);
@@ -108,7 +111,7 @@ public class ItemRequiresScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idA = TestingData.newIdA;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, itemValue);
         Statement statement = new StatementImpl("P157", mainSnak, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, requiredValue);
@@ -128,9 +131,10 @@ public class ItemRequiresScrutinizerTest extends ScrutinizerTest {
         ItemIdValue id = TestingData.existingId;
         ValueSnak mainSnak1 = Datamodel.makeValueSnak(propertyIdValue, itemValue);
         ValueSnak mainSnak2 = Datamodel.makeValueSnak(propertyParameterValue, requiredValue);
-        Statement statement1 = new StatementImpl("P157", mainSnak1,id);
-        Statement statement2 = new StatementImpl("P1196", mainSnak2,id);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement1).addStatement(statement2).build();
+        Statement statement1 = new StatementImpl("P157", mainSnak1, id);
+        Statement statement2 = new StatementImpl("P1196", mainSnak2, id);
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement1).addStatement(statement2)
+                .build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, requiredValue);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/MultiValueScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/MultiValueScrutinizerTest.java
index 3d724ce4a..b4d3ff918 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/MultiValueScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/MultiValueScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -40,7 +41,8 @@ public class MultiValueScrutinizerTest extends ScrutinizerTest {
         Snak snakValue2 = Datamodel.makeSomeValueSnak(propertyIdValue);
         Statement statement1 = new StatementImpl("P1963", snakValue1, idA);
         Statement statement2 = new StatementImpl("P1963", snakValue2, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(TestingData.generateStatement(idA, idB))
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA)
+                .addStatement(TestingData.generateStatement(idA, idB))
                 .addStatement(TestingData.generateStatement(idA, idB)).addStatement(statement1).addStatement(statement2).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, new ArrayList<>());
@@ -58,8 +60,10 @@ public class MultiValueScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idB = TestingData.newIdB;
         Snak mainSnakValue = Datamodel.makeValueSnak(propertyIdValue, valueSnak);
         Statement statement = new StatementImpl("P1963", mainSnakValue, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(TestingData.generateStatement(idA, idB)).addStatement(statement).build();
-        TermedStatementEntityUpdate updateB = new ItemUpdateBuilder(idB).addStatement(TestingData.generateStatement(idB, idB)).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA)
+                .addStatement(TestingData.generateStatement(idA, idB)).addStatement(statement).build();
+        TermedStatementEntityUpdate updateB = new TermedStatementEntityUpdateBuilder(idB)
+                .addStatement(TestingData.generateStatement(idB, idB)).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -76,8 +80,10 @@ public class MultiValueScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idB = TestingData.matchedId;
         Snak mainSnakValue = Datamodel.makeValueSnak(propertyIdValue, valueSnak);
         Statement statement = new StatementImpl("P1963", mainSnakValue, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(TestingData.generateStatement(idA, idB)).addStatement(statement).build();
-        TermedStatementEntityUpdate updateB = new ItemUpdateBuilder(idB).addStatement(TestingData.generateStatement(idB, idB)).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA)
+                .addStatement(TestingData.generateStatement(idA, idB)).addStatement(statement).build();
+        TermedStatementEntityUpdate updateB = new TermedStatementEntityUpdateBuilder(idB)
+                .addStatement(TestingData.generateStatement(idB, idB)).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NewItemScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NewItemScrutinizerTest.java
index 45bfa815d..27b59c636 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NewItemScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NewItemScrutinizerTest.java
@@ -21,13 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import java.util.Collections;
 
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.Claim;
@@ -48,7 +49,7 @@ public class NewItemScrutinizerTest extends ScrutinizerTest {
 
     @Test
     public void testTrigger() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA).build();
         scrutinize(update);
         assertWarningsRaised(NewItemScrutinizer.noDescType, NewItemScrutinizer.noLabelType,
                 NewItemScrutinizer.noTypeType, NewItemScrutinizer.newItemType);
@@ -56,7 +57,7 @@ public class NewItemScrutinizerTest extends ScrutinizerTest {
 
     @Test
     public void testEmptyItem() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.existingId).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.existingId).build();
         scrutinize(update);
         assertNoWarningRaised();
     }
@@ -64,7 +65,7 @@ public class NewItemScrutinizerTest extends ScrutinizerTest {
     @Test
     public void testGoodNewItem() {
 
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addLabel(Datamodel.makeMonolingualTextValue("bonjour", "fr"), false)
                 .addDescription(Datamodel.makeMonolingualTextValue("interesting item", "en"), true).addStatement(p31Statement)
                 .build();
@@ -74,7 +75,7 @@ public class NewItemScrutinizerTest extends ScrutinizerTest {
 
     @Test
     public void testDeletedStatements() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(TestingData.newIdA)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(TestingData.newIdA)
                 .addLabel(Datamodel.makeMonolingualTextValue("bonjour", "fr"), false)
                 .addDescription(Datamodel.makeMonolingualTextValue("interesting item", "en"), true).addStatement(p31Statement)
                 .deleteStatement(TestingData.generateStatement(TestingData.newIdA, TestingData.matchedId)).build();
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NoEditsMadeScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NoEditsMadeScrutinizerTest.java
index 6a2088ed5..050f366ea 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NoEditsMadeScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/NoEditsMadeScrutinizerTest.java
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.testing.TestingData;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 
 public class NoEditsMadeScrutinizerTest extends ScrutinizerTest {
@@ -42,13 +43,13 @@ public class NoEditsMadeScrutinizerTest extends ScrutinizerTest {
 
     @Test
     public void testNonNull() {
-        scrutinize(new ItemUpdateBuilder(TestingData.newIdA).build());
+        scrutinize(new TermedStatementEntityUpdateBuilder(TestingData.newIdA).build());
         assertNoWarningRaised();
     }
 
     @Test
     public void testNull() {
-        scrutinize(new ItemUpdateBuilder(TestingData.existingId).build());
+        scrutinize(new TermedStatementEntityUpdateBuilder(TestingData.existingId).build());
         assertWarningsRaised(NoEditsMadeScrutinizer.type);
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QualifierCompatibilityScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QualifierCompatibilityScrutinizerTest.java
index 9c6bd3dfb..2f0feee8c 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QualifierCompatibilityScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QualifierCompatibilityScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.Claim;
@@ -72,7 +73,7 @@ public class QualifierCompatibilityScrutinizerTest extends StatementScrutinizerT
         Snak mainSnak = Datamodel.makeSomeValueSnak(allowedPropertyIdValue);
         Snak qualifierSnak = Datamodel.makeSomeValueSnak(disallowedQualifierProperty);
         Statement statement = makeStatement(mainSnak, qualifierSnak);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak constraintQualifierSnak = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         List<Snak> qualifierList = Collections.singletonList(constraintQualifierSnak);
@@ -93,7 +94,7 @@ public class QualifierCompatibilityScrutinizerTest extends StatementScrutinizerT
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeSomeValueSnak(mandatoryPropertyIdValue);
         Statement statement = makeStatement(mainSnak);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak constraintQualifierSnak = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         List<Snak> qualifierList = Collections.singletonList(constraintQualifierSnak);
@@ -115,7 +116,7 @@ public class QualifierCompatibilityScrutinizerTest extends StatementScrutinizerT
         Snak mainSnak = Datamodel.makeSomeValueSnak(allowedPropertyIdValue);
         Snak qualifierSnak = Datamodel.makeSomeValueSnak(qualifierProperty);
         Statement statement = makeStatement(mainSnak, qualifierSnak);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak constraintQualifierSnak = Datamodel.makeValueSnak(propertyParameterPID, propertyParameterValue);
         List<Snak> qualifierList = Collections.singletonList(constraintQualifierSnak);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QuantityScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QuantityScrutinizerTest.java
index 2bf2b7615..3ffc4a478 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QuantityScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/QuantityScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -23,34 +24,33 @@ import java.util.List;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class QuantityScrutinizerTest extends ValueScrutinizerTest{
+public class QuantityScrutinizerTest extends ValueScrutinizerTest {
 
     public static final String NO_BOUNDS_CONSTRAINT_QID = "Q51723761";
     public static final String INTEGER_VALUED_CONSTRAINT_QID = "Q52848401";
     public static final String ALLOWED_UNITS_CONSTRAINT_QID = "Q21514353";
     public static final String ALLOWED_UNITS_CONSTRAINT_PID = "P2305";
-    
+
     private QuantityValue exactValue = Datamodel.makeQuantityValue(
             new BigDecimal("1.234"));
-    
+
     private QuantityValue integerValue = Datamodel.makeQuantityValue(
             new BigDecimal("132"));
-    
+
     private QuantityValue trailingZeros = Datamodel.makeQuantityValue(
             new BigDecimal("132.00"));
-    
+
     private QuantityValue valueWithBounds = Datamodel.makeQuantityValue(
             new BigDecimal("1.234"),
             new BigDecimal("1.200"),
             new BigDecimal("1.545"));
-    
+
     private QuantityValue wrongUnitValue = Datamodel.makeQuantityValue(
             new BigDecimal("1.234"), Datamodel.makeWikidataItemIdValue("Q346721"));
-    
+
     private QuantityValue goodUnitValue = Datamodel.makeQuantityValue(
             new BigDecimal("1.234"), (ItemIdValue) allowedUnit);
 
-
     public static PropertyIdValue propertyIdValue = Datamodel.makeWikidataPropertyIdValue("P1083");
     public static ItemIdValue noBoundsEntity = Datamodel.makeWikidataItemIdValue(NO_BOUNDS_CONSTRAINT_QID);
     public static ItemIdValue integerValueEntity = Datamodel.makeWikidataItemIdValue(INTEGER_VALUED_CONSTRAINT_QID);
@@ -62,13 +62,13 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
     public EditScrutinizer getScrutinizer() {
         return new QuantityScrutinizer();
     }
-    
+
     @Test
     public void testBoundsAllowed() {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, valueWithBounds);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
         when(fetcher.getConstraintsByType(propertyIdValue, NO_BOUNDS_CONSTRAINT_QID)).thenReturn(new ArrayList<>());
@@ -77,13 +77,13 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         scrutinize(update);
         assertNoWarningRaised();
     }
-    
+
     @Test
     public void testBoundsDisallowed() {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, valueWithBounds);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(noBoundsEntity, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -99,7 +99,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, exactValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
         when(fetcher.getConstraintsByType(propertyIdValue, INTEGER_VALUED_CONSTRAINT_QID)).thenReturn(new ArrayList<>());
@@ -114,7 +114,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, exactValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(integerValueEntity, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -130,7 +130,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, trailingZeros);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(integerValueEntity, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -146,7 +146,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, integerValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(integerValueEntity, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -162,7 +162,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, integerValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(itemParameterPID, allowedUnit);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -182,7 +182,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, wrongUnitValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(itemParameterPID, allowedUnit);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -202,7 +202,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, goodUnitValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(itemParameterPID, allowedUnit);
         List<Snak> qualifierSnakList = Collections.singletonList(qualifierSnak);
@@ -222,7 +222,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, goodUnitValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(allowedUnitEntity, new ArrayList<>());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -238,7 +238,7 @@ public class QuantityScrutinizerTest extends ValueScrutinizerTest{
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeValueSnak(propertyIdValue, integerValue);
         Statement statement = new StatementImpl("P1083", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
         when(fetcher.getConstraintsByType(propertyIdValue, ALLOWED_UNITS_CONSTRAINT_QID)).thenReturn(new ArrayList<>());
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedPositionScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedPositionScrutinizerTest.java
index 0a8199c56..633799f00 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedPositionScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedPositionScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -67,7 +68,7 @@ public class RestrictedPositionScrutinizerTest extends SnakScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeSomeValueSnak(propertyIdValue);
         Statement statement = new StatementImpl("P22", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(propertyScopeParameter, asQualifier);
         List<SnakGroup> constraintQualifiers = makeSnakGroupList(qualifierSnak);
@@ -85,7 +86,7 @@ public class RestrictedPositionScrutinizerTest extends SnakScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeSomeValueSnak(propertyIdValue);
         Statement statement = new StatementImpl("P22", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(propertyScopeParameter, asMainSnak);
         List<SnakGroup> constraintQualifiers = makeSnakGroupList(qualifierSnak);
@@ -103,7 +104,7 @@ public class RestrictedPositionScrutinizerTest extends SnakScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak mainSnak = Datamodel.makeSomeValueSnak(propertyIdValue);
         Statement statement = new StatementImpl("P22", mainSnak, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
         when(fetcher.getConstraintsByType(propertyIdValue, SCOPE_CONSTRAINT_QID)).thenReturn(new ArrayList<>());
@@ -122,7 +123,7 @@ public class RestrictedPositionScrutinizerTest extends SnakScrutinizerTest {
         Statement statement = Datamodel.makeStatement(
                 TestingData.generateStatement(idA, propertyIdValue, idA).getClaim(),
                 Collections.singletonList(Datamodel.makeReference(snakGroups)), StatementRank.NORMAL, "");
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement).build();
 
         Snak qualifierSnak = Datamodel.makeValueSnak(propertyScopeParameter, asMainSnak);
         List<SnakGroup> constraintQualifiers = makeSnakGroupList(qualifierSnak);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedValuesScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedValuesScrutinizerTest.java
index 6aadd9539..1f9495480 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedValuesScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/RestrictedValuesScrutinizerTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
@@ -24,7 +25,7 @@ public class RestrictedValuesScrutinizerTest extends SnakScrutinizerTest {
     public static final String ALLOWED_VALUES_CONSTRAINT_QID = "Q21510859";
     public static final String DISALLOWED_VALUES_CONSTRAINT_QID = "Q52558054";
     public static final String ALLOWED_VALUES_CONSTRAINT_PID = "P2305";
-    
+
     private ItemIdValue qid = Datamodel.makeWikidataItemIdValue("Q3487");
     public static PropertyIdValue allowedPropertyIdValue = Datamodel.makeWikidataPropertyIdValue("P1622");
     public static ItemIdValue allowedValue = Datamodel.makeWikidataItemIdValue("Q13196750");
@@ -39,7 +40,7 @@ public class RestrictedValuesScrutinizerTest extends SnakScrutinizerTest {
     public EditScrutinizer getScrutinizer() {
         return new RestrictedValuesScrutinizer();
     }
-    
+
     @Test
     public void testNoConstraint() {
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -51,7 +52,7 @@ public class RestrictedValuesScrutinizerTest extends SnakScrutinizerTest {
                 qid));
         assertNoWarningRaised();
     }
-    
+
     @Test
     public void testAllowedValue() {
         Snak mainSnak = Datamodel.makeValueSnak(allowedPropertyIdValue, allowedValue);
@@ -68,7 +69,7 @@ public class RestrictedValuesScrutinizerTest extends SnakScrutinizerTest {
         scrutinize(statement);
         assertNoWarningRaised();
     }
-    
+
     @Test
     public void testAllowedValueFailing() {
         Snak mainSnak = Datamodel.makeSomeValueSnak(allowedPropertyIdValue);
@@ -85,7 +86,7 @@ public class RestrictedValuesScrutinizerTest extends SnakScrutinizerTest {
         scrutinize(statement);
         assertWarningsRaised(RestrictedValuesScrutinizer.type);
     }
-    
+
     @Test
     public void testDisallowedValue() {
         Snak mainSnak = Datamodel.makeSomeValueSnak(disallowedPropertyIdValue);
@@ -102,7 +103,7 @@ public class RestrictedValuesScrutinizerTest extends SnakScrutinizerTest {
         scrutinize(statement);
         assertNoWarningRaised();
     }
-    
+
     @Test
     public void testDisallowedValueFailing() {
         Snak mainSnak = Datamodel.makeValueSnak(disallowedPropertyIdValue, disallowedValue);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java
index b70a8579b..06e3d0af6 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.manifests.Manifest;
@@ -84,8 +85,8 @@ public abstract class ScrutinizerTest {
 
     public void scrutinize(TermedStatementEntityUpdate... updates) {
         scrutinizer.batchIsBeginning();
-        for(TermedStatementEntityUpdate update : Arrays.asList(updates)) {
-            if(!update.isNull()) {
+        for (TermedStatementEntityUpdate update : Arrays.asList(updates)) {
+            if (!update.isNull()) {
                 scrutinizer.scrutinize(update);
             }
         }
@@ -114,14 +115,15 @@ public abstract class ScrutinizerTest {
 
     public List<Statement> constraintParameterStatementList(ItemIdValue itemIdValue, List<SnakGroup> listSnakGroup) {
         PropertyIdValue propertyIdValue = Datamodel.makeWikidataPropertyIdValue("P2302");
-        Snak snakValue = Datamodel.makeValueSnak(propertyIdValue,itemIdValue);
+        Snak snakValue = Datamodel.makeValueSnak(propertyIdValue, itemIdValue);
 
         Claim claim = Datamodel.makeClaim(itemIdValue, snakValue, listSnakGroup);
 
         Reference reference = Datamodel.makeReference(listSnakGroup);
         List<Reference> referenceList = Collections.singletonList(reference);
 
-        Statement statement = Datamodel.makeStatement(claim, referenceList, StatementRank.NORMAL, "P2302$77BD7FE4-C051-4776-855C-543F0CE697D0");
+        Statement statement = Datamodel.makeStatement(claim, referenceList, StatementRank.NORMAL,
+                "P2302$77BD7FE4-C051-4776-855C-543F0CE697D0");
         List<Statement> statements = Collections.singletonList(statement);
 
         return statements;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SelfReferentialScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SelfReferentialScrutinizerTest.java
index 8d8a1f9f3..690724f41 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SelfReferentialScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SelfReferentialScrutinizerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.testing.TestingData;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SingleValueScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SingleValueScrutinizerTest.java
index 01a8eab42..5efb95df7 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SingleValueScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SingleValueScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -64,7 +65,8 @@ public class SingleValueScrutinizerTest extends ScrutinizerTest {
         Snak snak2 = Datamodel.makeValueSnak(propertyIdValue, value2);
         Statement statement1 = new StatementImpl("P21", snak1, idA);
         Statement statement2 = new StatementImpl("P21", snak2, idA);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(idA).addStatement(statement1).addStatement(statement2).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).addStatement(statement2)
+                .build();
 
         List<Statement> statementList = constraintParameterStatementList(entityIdValue, new ArrayList<>());
 
@@ -80,7 +82,7 @@ public class SingleValueScrutinizerTest extends ScrutinizerTest {
         ItemIdValue idA = TestingData.existingId;
         Snak snak1 = Datamodel.makeValueSnak(propertyIdValue, value1);
         Statement statement1 = new StatementImpl("P21", snak1, idA);
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(idA).addStatement(statement1).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(idA).addStatement(statement1).build();
 
         List<Statement> statementList = constraintParameterStatementList(entityIdValue, new ArrayList<>());
 
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SnakScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SnakScrutinizerTest.java
index eebf86a4b..910485b86 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SnakScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/SnakScrutinizerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import java.util.Collections;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/StatementScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/StatementScrutinizerTest.java
index e2a37293a..8ce679b6a 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/StatementScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/StatementScrutinizerTest.java
@@ -21,17 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
 
 public abstract class StatementScrutinizerTest extends ScrutinizerTest {
 
     public void scrutinize(Statement statement) {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder((ItemIdValue) statement.getClaim().getSubject())
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder((ItemIdValue) statement.getClaim().getSubject())
                 .addStatement(statement).build();
         scrutinize(update);
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UnsourcedScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UnsourcedScrutinizerTest.java
index 3390e91c6..2ea67b715 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UnsourcedScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UnsourcedScrutinizerTest.java
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.implementation.StatementImpl;
@@ -72,7 +73,7 @@ public class UnsourcedScrutinizerTest extends StatementScrutinizerTest {
         ItemIdValue id = TestingData.existingId;
         Snak mainSnak = Datamodel.makeSomeValueSnak(propertyIdValue);
         Statement statement = new StatementImpl("P172", mainSnak, id);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, Collections.emptyList());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
@@ -90,7 +91,7 @@ public class UnsourcedScrutinizerTest extends StatementScrutinizerTest {
         List<SnakGroup> constraintQualifiers = makeSnakGroupList(referenceSnak);
         List<Statement> itemStatementList = constraintParameterStatementList(entityIdValue, constraintQualifiers);
         Statement statement = itemStatementList.get(0);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement).build();
 
         List<Statement> constraintDefinitions = constraintParameterStatementList(entityIdValue, Collections.emptyList());
         ConstraintFetcher fetcher = mock(ConstraintFetcher.class);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UseAsQualifierScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UseAsQualifierScrutinizerTest.java
index ea9ffb389..796f140e7 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UseAsQualifierScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/UseAsQualifierScrutinizerTest.java
@@ -1,9 +1,10 @@
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.qa.ConstraintFetcher;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
@@ -46,7 +47,7 @@ public class UseAsQualifierScrutinizerTest extends ScrutinizerTest {
         List<SnakGroup> qualifierList = makeSnakGroupList(statementQualifier);
         List<Statement> statementList = constraintParameterStatementList(useAsQualifierEntityId, qualifierList);
         Statement statement = statementList.get(0);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(qualifierPID, qualifierPropertyValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, qualifierAllowedValue);
@@ -67,7 +68,7 @@ public class UseAsQualifierScrutinizerTest extends ScrutinizerTest {
         List<SnakGroup> qualifierList = makeSnakGroupList(statementQualifier);
         List<Statement> statementList = constraintParameterStatementList(useAsQualifierEntityId, qualifierList);
         Statement statement = statementList.get(0);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(qualifierPID, qualifierPropertyValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, qualifierAllowedValue);
@@ -86,7 +87,7 @@ public class UseAsQualifierScrutinizerTest extends ScrutinizerTest {
         ItemIdValue id = TestingData.existingId;
         List<Statement> statementList = constraintParameterStatementList(useAsQualifierEntityId, new ArrayList<>());
         Statement statement = statementList.get(0);
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(id).addStatement(statement).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(id).addStatement(statement).build();
 
         Snak qualifierSnak1 = Datamodel.makeValueSnak(qualifierPID, qualifierPropertyValue);
         Snak qualifierSnak2 = Datamodel.makeValueSnak(itemParameterPID, qualifierAllowedValue);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ValueScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ValueScrutinizerTest.java
index 9a5856437..f7ec3a752 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ValueScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ValueScrutinizerTest.java
@@ -21,10 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.openrefine.wikidata.testing.TestingData;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
 import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;
@@ -37,12 +38,12 @@ public abstract class ValueScrutinizerTest extends SnakScrutinizerTest {
     public void scrutinize(Value value) {
         scrutinize(defaultPid, value);
     }
-    
+
     public void scrutinize(PropertyIdValue pid, Value value) {
         scrutinize(Datamodel.makeValueSnak(pid, value));
     }
 
     public void scrutinizeLabel(MonolingualTextValue text) {
-        scrutinize(new ItemUpdateBuilder(TestingData.existingId).addLabel(text, true).build());
+        scrutinize(new TermedStatementEntityUpdateBuilder(TestingData.existingId).addLabel(text, true).build());
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/WhitespaceScrutinizerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/WhitespaceScrutinizerTest.java
index 25a70049c..611b72d24 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/WhitespaceScrutinizerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/WhitespaceScrutinizerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.qa.scrutinizers;
 
 import org.testng.annotations.Test;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java
index 64f6f6ecc..11d7f7d19 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import static org.testng.Assert.assertEquals;
@@ -43,19 +44,22 @@ public class ExpressionContextTest extends WikidataRefineTest {
 
     @Test
     public void testGetCellByColumnName() {
-        ExpressionContext ctxt = new ExpressionContext("foo:", "https://www.wikidata.org/w/api.php", 1, project.rows.get(1), project.columnModel, null);
+        ExpressionContext ctxt = new ExpressionContext("foo:", null, "https://www.wikidata.org/w/api.php", 1, project.rows.get(1),
+                project.columnModel, null);
         assertEquals("e", ctxt.getCellByName("b").value);
     }
 
     @Test
     public void testNonExistentColumn() {
-        ExpressionContext ctxt = new ExpressionContext("foo:", "https://www.wikidata.org/w/api.php", 1, project.rows.get(1), project.columnModel, null);
+        ExpressionContext ctxt = new ExpressionContext("foo:", null, "https://www.wikidata.org/w/api.php", 1, project.rows.get(1),
+                project.columnModel, null);
         assertNull(ctxt.getCellByName("auie"));
     }
 
     @Test
     public void testGetRowId() {
-        ExpressionContext ctxt = new ExpressionContext("foo:", "https://www.wikidata.org/w/api.php", 1, project.rows.get(1), project.columnModel, null);
+        ExpressionContext ctxt = new ExpressionContext("foo:", null, "https://www.wikidata.org/w/api.php", 1, project.rows.get(1),
+                project.columnModel, null);
         assertEquals(1, ctxt.getRowId());
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java
index af1ec63b8..e2c76a3bf 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateConstantTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.util.Calendar;
@@ -62,7 +63,6 @@ public class WbDateConstantTest extends WbExpressionTest<TimeValue> {
     private WbDateConstant BCEjulianYear = new WbDateConstant("-1324_Q1985786");
     private WbDateConstant BCEjulianDecade = new WbDateConstant("-1320D_Q1985786");
 
-    
     @Test
     public void testSerialize() {
         JacksonSerializationTest.canonicalSerialization(WbExpression.class, year,
@@ -73,7 +73,7 @@ public class WbDateConstantTest extends WbExpressionTest<TimeValue> {
 
     @Test
     public void testEvaluate() {
-        
+
         evaluatesTo(Datamodel.makeTimeValue(1001, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 6, 0, 0, 0,
                 TimeValue.CM_GREGORIAN_PRO), millenium);
         evaluatesTo(Datamodel.makeTimeValue(1701, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 7, 0, 0, 0,
@@ -93,7 +93,7 @@ public class WbDateConstantTest extends WbExpressionTest<TimeValue> {
 
         evaluatesTo(Datamodel.makeTimeValue(2018, (byte) 2, (byte) 27, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
                 TimeValue.CM_GREGORIAN_PRO), whitespace);
-        
+
         evaluatesTo(Datamodel.makeTimeValue(1320, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 8, 0, 0, 0,
                 TimeValue.CM_JULIAN_PRO), julianDecade);
         evaluatesTo(Datamodel.makeTimeValue(1324, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 9, 0, 0, 0,
@@ -138,13 +138,13 @@ public class WbDateConstantTest extends WbExpressionTest<TimeValue> {
 
     @Test
     public void testToday() {
-    	Calendar calendar = Calendar.getInstance();
-    	TimeValue expectedDate = Datamodel.makeTimeValue(
-    			calendar.get(Calendar.YEAR),
-    			(byte)(calendar.get(Calendar.MONTH)+1),
-    			(byte)calendar.get(Calendar.DAY_OF_MONTH),
-    			(byte)0, (byte)0, (byte)0, (byte)11, 0,0,0, TimeValue.CM_GREGORIAN_PRO);
-    	evaluatesTo(expectedDate, new WbDateConstant("TODAY"));
+        Calendar calendar = Calendar.getInstance();
+        TimeValue expectedDate = Datamodel.makeTimeValue(
+                calendar.get(Calendar.YEAR),
+                (byte) (calendar.get(Calendar.MONTH) + 1),
+                (byte) calendar.get(Calendar.DAY_OF_MONTH),
+                (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
+        evaluatesTo(expectedDate, new WbDateConstant("TODAY"));
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class)
@@ -156,9 +156,9 @@ public class WbDateConstantTest extends WbExpressionTest<TimeValue> {
     public void testPartlyValid() {
         new WbDateConstant("2018-partly valid");
     }
-    
+
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testInvalidCalendar() {
-    	new WbDateConstant("2018-01-02_P234");
+        new WbDateConstant("2018-01-02_P234");
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java
index 08e7b5a20..638d38851 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbDateVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
@@ -35,10 +36,10 @@ public class WbDateVariableTest extends WbVariableTest<TimeValue> {
     private TimeValue year = Datamodel.makeTimeValue(2018, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 9,
             0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
     private TimeValue day = Datamodel.makeTimeValue(2018, (byte) 2, (byte) 27, (byte) 0, (byte) 0, (byte) 0, (byte) 11,
-            0, 0, 0,  TimeValue.CM_GREGORIAN_PRO);
-    private TimeValue minute = Datamodel.makeTimeValue(2001, (byte) 2, (byte) 3, (byte)0, (byte)0, (byte)0, (byte)11, (byte)0, (byte)0, (byte)0, TimeValue.CM_GREGORIAN_PRO);
+            0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
+    private TimeValue minute = Datamodel.makeTimeValue(2001, (byte) 2, (byte) 3, (byte) 0, (byte) 0, (byte) 0, (byte) 11, (byte) 0,
+            (byte) 0, (byte) 0, TimeValue.CM_GREGORIAN_PRO);
 
-    
     @Override
     public WbVariableExpr<TimeValue> initVariableExpr() {
         return new WbDateVariable();
@@ -61,12 +62,12 @@ public class WbDateVariableTest extends WbVariableTest<TimeValue> {
         isSkipped("  2018-XX");
         isSkipped("invalid format");
     }
-    
+
     @Test
     public void testNullStringValue() {
         isSkipped((String) null);
     }
-    
+
     @Test
     public void testNullCell() {
         isSkipped((Cell) null);
@@ -78,10 +79,10 @@ public class WbDateVariableTest extends WbVariableTest<TimeValue> {
         evaluatesTo(year, new Cell(2018, null));
         isSkipped(new Cell(1234.56, null));
     }
-    
+
     @Test
     public void testMinutesISO() {
-    	// Wikidata currently only supports up to day precision
+        // Wikidata currently only supports up to day precision
         evaluatesTo(minute, "2001-02-03T04:05Z");
     }
 
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityIdValueConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityIdValueConstantTest.java
new file mode 100644
index 000000000..fe8fdcc93
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityIdValueConstantTest.java
@@ -0,0 +1,25 @@
+
+package org.openrefine.wikidata.schema;
+
+import org.openrefine.wikidata.testing.JacksonSerializationTest;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.wikidata.wdtk.datamodel.helpers.Datamodel;
+import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
+
+public class WbEntityIdValueConstantTest extends WbExpressionTest<EntityIdValue> {
+
+    private WbEntityIdValueConstant constant = new WbEntityIdValueConstant("P48", "my ID");
+
+    @Test
+    public void testEvaluate() {
+        EntityIdValue result = constant.evaluate(ctxt);
+        Assert.assertEquals(Datamodel.makeWikidataPropertyIdValue("P48").getIri(), result.getIri());
+    }
+
+    @Test
+    public void testSerialize() {
+        JacksonSerializationTest.canonicalSerialization(WbExpression.class, constant,
+                "{\"type\":\"wbentityidvalueconstant\",\"id\":\"P48\",\"label\":\"my ID\"}");
+    }
+}
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityVariableTest.java
index 42f37b9bf..7174eb438 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbEntityVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.util.Collections;
@@ -98,6 +99,7 @@ public class WbEntityVariableTest extends WbVariableTest<EntityIdValue> {
         recon.identifierSpace = "http://my.own.wikiba.se/";
         recon.candidates = Collections.singletonList(new ReconCandidate("Q123", "some item", null, 100.0));
         recon.judgment = Recon.Judgment.Matched;
+        recon.match = recon.candidates.get(0);
         Cell cell = new Cell("some value", recon);
         isSkipped(cell);
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java
index ceceb8d2a..593b4dde0 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbExpressionTest.java
@@ -21,10 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Collections;
 
 import okhttp3.mockwebserver.Dispatcher;
 import okhttp3.mockwebserver.MockResponse;
@@ -59,6 +61,7 @@ public class WbExpressionTest<T> extends WikidataRefineTest {
         server = new MockWebServer();
         String json = TestingData.jsonFromFile("langcode/wikidata-monolingualtext-langcode.json");
         server.setDispatcher(new Dispatcher() {
+
             @Override
             public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
                 return new MockResponse()
@@ -81,7 +84,8 @@ public class WbExpressionTest<T> extends WikidataRefineTest {
                 "column A,column B,column C,column D,column E\n" + "value A,value B,value C,value D,value E");
         warningStore = new QAWarningStore();
         row = project.rows.get(0);
-        ctxt = new ExpressionContext("http://www.wikidata.org/entity/", server.url("/w/api.php").toString(), 0, row, project.columnModel, warningStore);
+        ctxt = new ExpressionContext("http://www.wikidata.org/entity/", Collections.emptyMap(), server.url("/w/api.php").toString(), 0, row,
+                project.columnModel, warningStore);
     }
 
     /**
@@ -103,7 +107,7 @@ public class WbExpressionTest<T> extends WikidataRefineTest {
 
     /**
      * Test that a particular expression is skipped.
-
+     * 
      * @param expression
      *            the expression to evaluate
      */
@@ -133,7 +137,8 @@ public class WbExpressionTest<T> extends WikidataRefineTest {
                 row.cells.add(cell);
             }
         }
-        ctxt = new ExpressionContext("http://www.wikidata.org/entity/", server.url("/w/api.php").toString(), 0, row, project.columnModel, warningStore);
+        ctxt = new ExpressionContext("http://www.wikidata.org/entity/", null, server.url("/w/api.php").toString(), 0, row,
+                project.columnModel, warningStore);
     }
 
     /**
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemConstantTest.java
index 33be5c189..a3f1a399d 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemConstantTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemConstantTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemDocumentExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemDocumentExprTest.java
index 39a487ac3..291e0e97b 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemDocumentExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemDocumentExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.util.Collections;
@@ -28,7 +29,7 @@ import java.util.List;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
@@ -64,7 +65,8 @@ public class WbItemDocumentExprTest extends WbExpressionTest<TermedStatementEnti
     @Test
     public void testEvaluate() {
         setRow(recon("Q3434"), "2010-07-23", "3.898,4.389", "my alias", recon("Q23"));
-        TermedStatementEntityUpdate result = new ItemUpdateBuilder(subject).addAlias(alias).addStatement(fullStatement).build();
+        TermedStatementEntityUpdate result = new TermedStatementEntityUpdateBuilder(subject).addAlias(alias).addStatement(fullStatement)
+                .build();
         evaluatesTo(result, expr);
     }
 
@@ -77,14 +79,14 @@ public class WbItemDocumentExprTest extends WbExpressionTest<TermedStatementEnti
     @Test
     public void testStatementSkipped() {
         setRow(recon("Q3434"), "2010-07-23", "3.898,invalid4.389", "my alias", recon("Q23"));
-        TermedStatementEntityUpdate result = new ItemUpdateBuilder(subject).addAlias(alias).build();
+        TermedStatementEntityUpdate result = new TermedStatementEntityUpdateBuilder(subject).addAlias(alias).build();
         evaluatesTo(result, expr);
     }
 
     @Test
     public void testAliasSkipped() {
         setRow(recon("Q3434"), "2010-07-23", "3.898,4.389", "", recon("Q23"));
-        TermedStatementEntityUpdate result = new ItemUpdateBuilder(subject).addStatement(fullStatement).build();
+        TermedStatementEntityUpdate result = new TermedStatementEntityUpdateBuilder(subject).addStatement(fullStatement).build();
         evaluatesTo(result, expr);
     }
 
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemVariableTest.java
index bf9363aa8..8da088da0 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbItemVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.util.Collections;
@@ -67,7 +68,7 @@ public class WbItemVariableTest extends WbVariableTest<ItemIdValue> {
         Cell cell = new Cell("some value", recon);
         isSkipped(cell);
     }
-    
+
     @Test
     public void testInvalidSpace() {
         Recon recon = Recon.makeWikidataRecon(34989L);
@@ -82,12 +83,12 @@ public class WbItemVariableTest extends WbVariableTest<ItemIdValue> {
     public void testUnreconciledCell() {
         isSkipped("some value");
     }
-    
+
     @Test
     public void testNullCell() {
         isSkipped((Cell) null);
     }
-    
+
     @Test
     public void testNullStringValue() {
         isSkipped((String) null);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java
index ef88c60c9..a846cc503 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageVariableTest.java
index e1187ee32..05b1dfde8 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
@@ -48,7 +49,7 @@ public class WbLanguageVariableTest extends WbVariableTest<String> {
         isSkipped((String) null);
         isSkipped("");
     }
-    
+
     @Test
     public void testNullCell() {
         isSkipped((Cell) null);
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java
index 640e1a95e..9d30dd12e 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationVariableTest.java
index 5c7407a0b..de9826ceb 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
@@ -64,12 +65,12 @@ public class WbLocationVariableTest extends WbVariableTest<GlobeCoordinatesValue
     public void testEmpty() {
         isSkipped("");
     }
-    
+
     @Test
     public void testNullStringValue() {
         isSkipped((String) null);
     }
-    
+
     public void testNullCell() {
         isSkipped((Cell) null);
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbMonolingualExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbMonolingualExprTest.java
index 09dd4bd23..3037a6c80 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbMonolingualExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbMonolingualExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.testng.annotations.Test;
@@ -43,7 +44,7 @@ public class WbMonolingualExprTest extends WbExpressionTest<MonolingualTextValue
         setRow("en", "hello");
         evaluatesTo(Datamodel.makeMonolingualTextValue("hello", "en"), expr);
     }
-    
+
     @Test
     public void testTrim() {
         setRow("en", " hello ");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java
index 51ed2ab27..a635100e2 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import static org.testng.Assert.assertEquals;
@@ -29,7 +30,7 @@ import java.util.Collections;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
 import org.openrefine.wikidata.testing.TestingData;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
@@ -49,7 +50,7 @@ public class WbNameDescExprTest extends WbExpressionTest<MonolingualTextValue> {
     public void testContributeToLabel() {
         WbNameDescExpr labelExpr = new WbNameDescExpr(WbNameDescExpr.NameDescType.LABEL,
                 TestingData.getTestMonolingualExpr("fr", "français", "le croissant magnifique"));
-        ItemUpdateBuilder update = new ItemUpdateBuilder(subject);
+        TermedStatementEntityUpdateBuilder update = new TermedStatementEntityUpdateBuilder(subject);
         labelExpr.contributeTo(update, ctxt);
         assertEquals(Collections.singleton(Datamodel.makeMonolingualTextValue("le croissant magnifique", "fr")),
                 update.build().getLabels());
@@ -59,7 +60,7 @@ public class WbNameDescExprTest extends WbExpressionTest<MonolingualTextValue> {
     public void testContributeToDescription() {
         WbNameDescExpr descriptionExpr = new WbNameDescExpr(WbNameDescExpr.NameDescType.DESCRIPTION,
                 TestingData.getTestMonolingualExpr("de", "Deutsch", "wunderschön"));
-        ItemUpdateBuilder update = new ItemUpdateBuilder(subject);
+        TermedStatementEntityUpdateBuilder update = new TermedStatementEntityUpdateBuilder(subject);
         descriptionExpr.contributeTo(update, ctxt);
         assertEquals(Collections.singleton(Datamodel.makeMonolingualTextValue("wunderschön", "de")),
                 update.build().getDescriptions());
@@ -69,7 +70,7 @@ public class WbNameDescExprTest extends WbExpressionTest<MonolingualTextValue> {
     public void testContributeToAlias() {
         WbNameDescExpr aliasExpr = new WbNameDescExpr(WbNameDescExpr.NameDescType.ALIAS,
                 TestingData.getTestMonolingualExpr("en", "English", "snack"));
-        ItemUpdateBuilder update = new ItemUpdateBuilder(subject);
+        TermedStatementEntityUpdateBuilder update = new TermedStatementEntityUpdateBuilder(subject);
         aliasExpr.contributeTo(update, ctxt);
         assertEquals(Collections.singleton(Datamodel.makeMonolingualTextValue("snack", "en")),
                 update.build().getAliases());
@@ -77,10 +78,10 @@ public class WbNameDescExprTest extends WbExpressionTest<MonolingualTextValue> {
 
     @Test
     public void testSkipped() {
-        ItemUpdateBuilder update = new ItemUpdateBuilder(subject);
+        TermedStatementEntityUpdateBuilder update = new TermedStatementEntityUpdateBuilder(subject);
         setRow("");
         expr.contributeTo(update, ctxt);
-        assertEquals(new ItemUpdateBuilder(subject).build(), update.build());
+        assertEquals(new TermedStatementEntityUpdateBuilder(subject).build(), update.build());
     }
 
     @Test
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbPropConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbPropConstantTest.java
index 46ceddb9b..2b28ce20e 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbPropConstantTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbPropConstantTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java
index ff4431b61..e33fb98ea 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import static org.testng.Assert.assertEquals;
@@ -46,11 +47,11 @@ public class WbQuantityExprTest extends WbExpressionTest<QuantityValue> {
         setRow("4.00");
         evaluatesTo(Datamodel.makeQuantityValue(new BigDecimal("4.00")), exprWithoutUnit);
     }
-    
+
     @Test
     public void testOverflow() {
-    	setRow(14341937500d);
-    	evaluatesTo(Datamodel.makeQuantityValue(new BigDecimal("14341937500")), exprWithoutUnit);
+        setRow(14341937500d);
+        evaluatesTo(Datamodel.makeQuantityValue(new BigDecimal("14341937500")), exprWithoutUnit);
     }
 
     @Test
@@ -81,7 +82,7 @@ public class WbQuantityExprTest extends WbExpressionTest<QuantityValue> {
         setRow("56.094", "not reconciled");
         isSkipped(exprWithUnit);
     }
-    
+
     // for issue #341: https://github.com/Wikidata/Wikidata-Toolkit/issues/341
     @Test
     public void testExponent() throws SkipSchemaExpressionException, JsonProcessingException {
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbReferenceExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbReferenceExprTest.java
index d04e3ae5a..6c4e5b585 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbReferenceExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbReferenceExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.util.Arrays;
@@ -44,7 +45,8 @@ public class WbReferenceExprTest extends WbExpressionTest<Reference> {
             new WbSnakExpr(new WbPropConstant("P347", "reference URL", "url"), new WbStringVariable("column B"))));
 
     private Snak snak1 = Datamodel.makeValueSnak(Datamodel.makeWikidataPropertyIdValue("P87"),
-            Datamodel.makeTimeValue(2018, (byte) 3, (byte) 28, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO));
+            Datamodel.makeTimeValue(2018, (byte) 3, (byte) 28, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                    TimeValue.CM_GREGORIAN_PRO));
     private Snak snak2 = Datamodel.makeValueSnak(Datamodel.makeWikidataPropertyIdValue("P347"),
             Datamodel.makeStringValue("http://gnu.org/"));
 
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbSnakExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbSnakExprTest.java
index 4223459ca..b637fb633 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbSnakExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbSnakExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java
index 56523acdb..5dc99cf43 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.testng.Assert;
@@ -69,9 +70,11 @@ public class WbStatementExprTest extends WbExpressionTest<Statement> {
             Collections.singletonList(Datamodel.makeValueSnak(Datamodel.makeWikidataPropertyIdValue("P43"),
                     Datamodel.makeWikidataItemIdValue("Q3434"))))));
     private Snak qualifier = Datamodel.makeValueSnak(Datamodel.makeWikidataPropertyIdValue("P897"),
-            Datamodel.makeTimeValue(2010, (byte) 7, (byte) 23, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO));
+            Datamodel.makeTimeValue(2010, (byte) 7, (byte) 23, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                    TimeValue.CM_GREGORIAN_PRO));
     private Snak constantQualifier = Datamodel.makeValueSnak(Datamodel.makeWikidataPropertyIdValue("P897"),
-            Datamodel.makeTimeValue(2018, (byte) 4, (byte) 5, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO));
+            Datamodel.makeTimeValue(2018, (byte) 4, (byte) 5, (byte) 0, (byte) 0, (byte) 0, (byte) 11, 0, 0, 0,
+                    TimeValue.CM_GREGORIAN_PRO));
     private Snak mainsnak = Datamodel.makeValueSnak(property, Datamodel.makeGlobeCoordinatesValue(3.898, 4.389,
             WbLocationConstant.defaultPrecision, GlobeCoordinatesValue.GLOBE_EARTH));
     private Claim fullClaim = Datamodel.makeClaim(subject, mainsnak,
@@ -118,7 +121,7 @@ public class WbStatementExprTest extends WbExpressionTest<Statement> {
         setRow(recon("Q3434"), "2010-07-23", "3.898,4.389");
         evaluatesTo(fullStatement, new Wrapper(statementExpr));
     }
-    
+
     @Test
     public void testEvaluateWithConstant() {
         setRow(recon("Q3434"), "2010-07-23", "3.898,4.389");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementGroupExprTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementGroupExprTest.java
index 8369971c1..48ffc8f8b 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementGroupExprTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementGroupExprTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.util.Collections;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringConstantTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringConstantTest.java
index 57bc29c19..b337bc02b 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringConstantTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringConstantTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.schema;
 
 import org.openrefine.wikidata.testing.JacksonSerializationTest;
@@ -6,25 +7,25 @@ import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.StringValue;
 
 public class WbStringConstantTest extends WbExpressionTest<StringValue> {
-    
+
     private WbStringConstant constant = new WbStringConstant("hello world");
-    
+
     @Test
     public void testSerialize() {
         JacksonSerializationTest.canonicalSerialization(WbExpression.class, constant,
                 "{\"type\":\"wbstringconstant\",\"value\":\"hello world\"}");
     }
-    
+
     @Test
     public void testEvaluate() {
         evaluatesTo(Datamodel.makeStringValue("hello world"), constant);
     }
-    
+
     @Test
     public void testTrim() {
         evaluatesTo(Datamodel.makeStringValue("hello world"), new WbStringConstant(" hello world "));
     }
-    
+
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testEmpty() {
         new WbStringConstant("");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringVariableTest.java
index b30889e12..31ff6eca9 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStringVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import org.testng.annotations.Test;
@@ -40,16 +41,15 @@ public class WbStringVariableTest extends WbVariableTest<StringValue> {
     public void testEmpty() {
         isSkipped("");
     }
-    
+
     /**
-     * This should not normally happen: cell values should
-     * never be null (only whole cells can be null).
-     * But better safe than sorry!
+     * This should not normally happen: cell values should never be null (only whole cells can be null). But better safe
+     * than sorry!
      */
     public void testNullStringValue() {
         isSkipped((String) null);
     }
-    
+
     public void testNullCell() {
         isSkipped((Cell) null);
     }
@@ -60,46 +60,45 @@ public class WbStringVariableTest extends WbVariableTest<StringValue> {
     }
 
     /**
-     *  The evaluator cleans up leading and trailing whitespace, but not duplicate spaces
+     * The evaluator cleans up leading and trailing whitespace, but not duplicate spaces
      */
     @Test
     public void testTrailingWhitespace() {
         evaluatesTo(Datamodel.makeStringValue("dirty"), "dirty \t");
     }
-    
+
     /**
      * Test that integers are correctly converted to strings
      */
     @Test
     public void testInteger() {
-    	evaluatesTo(Datamodel.makeStringValue("45"), new Cell(45,null));
+        evaluatesTo(Datamodel.makeStringValue("45"), new Cell(45, null));
     }
-    
+
     /**
      * Test that floating point numbers with no decimal part are also converted
      */
     @Test
     public void testDoubleInteger() {
-    	evaluatesTo(Datamodel.makeStringValue("45"), new Cell(45.0,null));
+        evaluatesTo(Datamodel.makeStringValue("45"), new Cell(45.0, null));
     }
-    
+
     /**
      * Test that large doubles are correctly converted to strings
      */
     @Test
     public void testLargeDouble() {
-    	evaluatesTo(Datamodel.makeStringValue("14341937500"), new Cell(14341937500d, null));
+        evaluatesTo(Datamodel.makeStringValue("14341937500"), new Cell(14341937500d, null));
     }
-    
+
     /**
      * Test that large doubles are correctly converted to strings
      */
     @Test
     public void testLong() {
-    	evaluatesTo(Datamodel.makeStringValue("14341937500"), new Cell(14341937500L, null));
+        evaluatesTo(Datamodel.makeStringValue("14341937500"), new Cell(14341937500L, null));
     }
 
-
     @Test
     public void testLeadingWhitespace() {
         evaluatesTo(Datamodel.makeStringValue("dirty"), " dirty");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbVariableTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbVariableTest.java
index 89a31b52e..281792aa7 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbVariableTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbVariableTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import java.io.IOException;
@@ -35,8 +36,7 @@ public abstract class WbVariableTest<T> extends WbExpressionTest<T> {
     protected WbVariableExpr<T> variable;
 
     /**
-     * This should return a variable expression, to be tested with the helpers
-     * below.
+     * This should return a variable expression, to be tested with the helpers below.
      * 
      * @return
      */
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
index 9d0d4dbf0..6e12f9849 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema;
 
 import static org.testng.Assert.assertEquals;
@@ -34,7 +35,7 @@ import java.util.List;
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.testing.WikidataRefineTest;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
@@ -119,17 +120,17 @@ public class WikibaseSchemaTest extends WikidataRefineTest {
         Engine engine = new Engine(project);
         List<TermedStatementEntityUpdate> updates = schema.evaluate(project, engine);
         List<TermedStatementEntityUpdate> expected = new ArrayList<>();
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(qid1).addStatement(statement1).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(qid1).addStatement(statement1).build();
         expected.add(update1);
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(qid2).addStatement(statement2).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(qid2).addStatement(statement2).build();
         expected.add(update2);
         assertEquals(expected, updates);
     }
-    
+
     @Test(expectedExceptions = IOException.class)
     public void testDeserializeEmpty() throws IOException {
         String schemaJson = "{\"itemDocuments\":[{\"statementGroups\":[{\"statements\":[]}],"
-                +"\"nameDescs\":[]}],\"siteIri\":\"http://www.wikidata.org/entity/\"}";
+                + "\"nameDescs\":[]}],\"siteIri\":\"http://www.wikidata.org/entity/\"}";
         WikibaseSchema.reconstruct(schemaJson);
     }
 
@@ -140,7 +141,7 @@ public class WikibaseSchemaTest extends WikidataRefineTest {
         WikibaseSchema schema = WikibaseSchema.reconstruct(serialized);
         Engine engine = new Engine(project);
         EngineConfig engineConfig = EngineConfig.reconstruct("{\n"
-                + "      \"mode\": \"row-based\",\n" 
+                + "      \"mode\": \"row-based\",\n"
                 + "      \"facets\": [\n"
                 + "        {\n"
                 + "          \"mode\": \"text\",\n"
@@ -156,7 +157,7 @@ public class WikibaseSchemaTest extends WikidataRefineTest {
         engine.initializeFromConfig(engineConfig);
         List<TermedStatementEntityUpdate> updates = schema.evaluate(project, engine);
         List<TermedStatementEntityUpdate> expected = new ArrayList<>();
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(qid1).addStatement(statement1).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(qid1).addStatement(statement1).build();
         expected.add(update1);
         assertEquals(expected, updates);
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java
index f0805c423..04df4e6bd 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.schema.entityvalues;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValueTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValueTest.java
new file mode 100644
index 000000000..34d42f7f3
--- /dev/null
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/SuggestedEntityIdValueTest.java
@@ -0,0 +1,30 @@
+
+package org.openrefine.wikidata.schema.entityvalues;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.wikidata.wdtk.datamodel.interfaces.FormIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.LexemeIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.SenseIdValue;
+
+public class SuggestedEntityIdValueTest {
+
+    @Test
+    public void testSuggestedEntityIdValueType() {
+        SuggestedEntityIdValue value = SuggestedEntityIdValue.build("M1234", "http://foo.com/bar/", "my file");
+        Assert.assertTrue(value instanceof MediaInfoIdValue);
+        value = SuggestedEntityIdValue.build("P1234", "http://foo.com/bar/", "my file");
+        Assert.assertTrue(value instanceof PropertyIdValue);
+        value = SuggestedEntityIdValue.build("Q1234", "http://foo.com/bar/", "my file");
+        Assert.assertTrue(value instanceof ItemIdValue);
+        value = SuggestedEntityIdValue.build("L1234", "http://foo.com/bar/", "my file");
+        Assert.assertTrue(value instanceof LexemeIdValue);
+        value = SuggestedEntityIdValue.build("L1234-S123", "http://foo.com/bar/", "my file");
+        Assert.assertTrue(value instanceof SenseIdValue);
+        value = SuggestedEntityIdValue.build("L1234-F123", "http://foo.com/bar/", "my file");
+        Assert.assertTrue(value instanceof FormIdValue);
+    }
+}
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java
index 72fc70933..2c743177d 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.testing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java
index c3afec1ca..02654ebcb 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/TestingData.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.testing;
 
 import java.io.IOException;
@@ -32,11 +33,14 @@ import org.openrefine.wikidata.schema.WbLanguageConstant;
 import org.openrefine.wikidata.schema.WbMonolingualExpr;
 import org.openrefine.wikidata.schema.WbStringConstant;
 import org.openrefine.wikidata.schema.entityvalues.ReconItemIdValue;
+import org.openrefine.wikidata.schema.entityvalues.ReconMediaInfoIdValue;
 import org.openrefine.wikidata.schema.entityvalues.ReconPropertyIdValue;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.Claim;
+import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
 //import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
+import org.wikidata.wdtk.datamodel.interfaces.MediaInfoIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.PropertyIdValue;
 import org.wikidata.wdtk.datamodel.interfaces.Statement;
 import org.wikidata.wdtk.datamodel.interfaces.StatementRank;
@@ -69,12 +73,18 @@ public class TestingData {
     public static PropertyIdValue matchedPropertyID = makeMatchedPropertyIdValue("P38", "currency");
     public static PropertyIdValue existingPropertyId = Datamodel.makeWikidataPropertyIdValue("P43");
 
+    public static MediaInfoIdValue newMidA = makeNewMediaInfoIdValue(3412L, "new MediaInfo A");
+    public static MediaInfoIdValue newMidB = makeNewMediaInfoIdValue(6745L, "new MediaInfo B");
+    public static MediaInfoIdValue matchedMid = makeMatchedMediaInfoIdValue("M89", "eist");
+    public static MediaInfoIdValue existingMid = Datamodel.makeWikimediaCommonsMediaInfoIdValue("M43");
+
     protected static PropertyIdValue pid = Datamodel.makeWikidataPropertyIdValue("P38");
-    
+
     public static class ReconStub extends Recon {
+
         public ReconStub(long id, long judgmentHistoryEntry) {
             super(id, judgmentHistoryEntry);
-        }  
+        }
     }
 
     public static Recon makeNewItemRecon(long id) {
@@ -117,14 +127,22 @@ public class TestingData {
         return new ReconPropertyIdValue(makeNewItemRecon(judgmentId), name);
     }
 
+    public static MediaInfoIdValue makeNewMediaInfoIdValue(long judgmentId, String name) {
+        return new ReconMediaInfoIdValue(makeNewItemRecon(judgmentId), name);
+    }
+
     public static ReconPropertyIdValue makeMatchedPropertyIdValue(String pid, String name) {
         return new ReconPropertyIdValue(makeMatchedRecon(pid, name), name);
     }
 
+    public static MediaInfoIdValue makeMatchedMediaInfoIdValue(String mid, String name) {
+        return new ReconMediaInfoIdValue(makeMatchedRecon(mid, name), name);
+    }
+
     public static WbMonolingualExpr getTestMonolingualExpr(String langCode, String langLabel, String text) {
         return new WbMonolingualExpr(new WbLanguageConstant(langCode, langLabel), new WbStringConstant(text));
     }
-/*
+
     public static Statement generateStatement(EntityIdValue from, PropertyIdValue pid, EntityIdValue to) {
         Claim claim = Datamodel.makeClaim(from, Datamodel.makeValueSnak(pid, to), Collections.emptyList());
         return Datamodel.makeStatement(claim, Collections.emptyList(), StatementRank.NORMAL, "");
@@ -133,7 +151,7 @@ public class TestingData {
     public static Statement generateStatement(EntityIdValue from, EntityIdValue to) {
         return generateStatement(from, pid, to);
     }
-*/
+
     public static Statement generateStatement(ItemIdValue from, PropertyIdValue pid, ItemIdValue to) {
         Claim claim = Datamodel.makeClaim(from, Datamodel.makeValueSnak(pid, to), Collections.emptyList());
         return Datamodel.makeStatement(claim, Collections.emptyList(), StatementRank.NORMAL, "");
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/WikidataRefineTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/WikidataRefineTest.java
index 2e61b413d..487b73f0d 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/WikidataRefineTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/testing/WikidataRefineTest.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.testing;
 
 import static org.mockito.Mockito.mock;
@@ -7,7 +8,6 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.BeforeMethod;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -22,42 +22,43 @@ import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.model.Project;
 
-public class WikidataRefineTest extends PowerMockTestCase {
-	protected File workspaceDir;
+public class WikidataRefineTest {
+
+    protected File workspaceDir;
     protected RefineServlet servlet;
     private List<Project> projects = new ArrayList<Project>();
     private List<ImportingJob> importingJobs = new ArrayList<ImportingJob>();
-    
+
     public Project createCSVProject(String input) {
-    	return createCSVProject("test project", input);
+        return createCSVProject("test project", input);
     }
-    
+
     protected Project createCSVProject(String projectName, String input) {
         Project project = new Project();
-        
+
         ProjectMetadata metadata = new ProjectMetadata();
         metadata.setName(projectName);
-        
+
         ObjectNode options = mock(ObjectNode.class);
         RefineTest.prepareImportOptions(options, ",", -1, 0, 0, 1, false, false);
-        
+
         ImportingJob job = ImportingManager.createJob();
-        
+
         SeparatorBasedImporter importer = new SeparatorBasedImporter();
-        
+
         List<Exception> exceptions = new ArrayList<Exception>();
         importer.parseOneFile(project, metadata, job, "filesource", new StringReader(input), -1, options, exceptions);
         project.update();
         ProjectManager.singleton.registerProject(project, metadata);
-        
+
         projects.add(project);
         importingJobs.add(job);
         return project;
     }
-    
+
     @BeforeMethod(alwaysRun = true)
     public void initServlet() {
-    	servlet = new RefineServletStub();
+        servlet = new RefineServletStub();
         ProjectManager.singleton = new ProjectManagerStub();
         ImportingManager.initialize(servlet);
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java
index c93fa751c..cc72ab28e 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.updates;
 
 import static org.testng.Assert.assertEquals;
@@ -78,62 +79,62 @@ public class ItemUpdateTest {
 
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testCreateWithoutSubject() {
-        new ItemUpdateBuilder(null);
+        new TermedStatementEntityUpdateBuilder(null);
     }
 
     @Test
     public void testIsNull() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject).build();
         assertTrue(update.isNull());
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(newSubject).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(newSubject).build();
         assertFalse(update2.isNull());
     }
 
     @Test
     public void testIsEmpty() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject).build();
         assertTrue(update.isEmpty());
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(newSubject).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(newSubject).build();
         assertTrue(update2.isEmpty());
     }
 
     @Test
     public void testIsNew() {
-    	TermedStatementEntityUpdate newUpdate = new ItemUpdateBuilder(newSubject).build();
+        TermedStatementEntityUpdate newUpdate = new TermedStatementEntityUpdateBuilder(newSubject).build();
         assertTrue(newUpdate.isNew());
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject).build();
         assertFalse(update.isNew());
     }
 
     @Test
     public void testAddStatements() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject).addStatement(statement1).addStatement(statement2)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject).addStatement(statement1)
+                .addStatement(statement2)
                 .build();
         assertFalse(update.isNull());
         assertEquals(Arrays.asList(statement1, statement2), update.getAddedStatements());
         assertEquals(statementGroups, update.getAddedStatementGroups().stream().collect(Collectors.toSet()));
     }
-    
+
     /**
-     * Test disabled because it fails due to
-     * https://github.com/Wikidata/Wikidata-Toolkit/issues/417
-     * (not fixed as of WDTK 0.10.0).
+     * Test disabled because it fails due to https://github.com/Wikidata/Wikidata-Toolkit/issues/417 (not fixed as of
+     * WDTK 0.10.0).
      * 
-     * This bug is not critical as the extraneous serialized data
-     * is ignored by Wikibase.
+     * This bug is not critical as the extraneous serialized data is ignored by Wikibase.
      * 
      * @todo reenable once a later version is released
      */
-    @Test(enabled=false)
+    @Test(enabled = false)
     public void testSerializeStatements() throws IOException {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject).addStatement(statement1).addStatement(statement2)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject).addStatement(statement1)
+                .addStatement(statement2)
                 .build();
-    	TestUtils.isSerializedTo(update, TestingData.jsonFromFile("updates/statement_groups.json"));
+        TestUtils.isSerializedTo(update, TestingData.jsonFromFile("updates/statement_groups.json"));
     }
 
     @Test
     public void testDeleteStatements() {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject).deleteStatement(statement1)
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject).deleteStatement(statement1)
                 .deleteStatement(statement2).build();
         assertEquals(Arrays.asList(statement1, statement2).stream().collect(Collectors.toSet()),
                 update.getDeletedStatements());
@@ -141,8 +142,8 @@ public class ItemUpdateTest {
 
     @Test
     public void testMerge() {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingSubject).addStatement(statement1).build();
-    	TermedStatementEntityUpdate updateB = new ItemUpdateBuilder(existingSubject).addStatement(statement2).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingSubject).addStatement(statement1).build();
+        TermedStatementEntityUpdate updateB = new TermedStatementEntityUpdateBuilder(existingSubject).addStatement(statement2).build();
         assertNotEquals(updateA, updateB);
         TermedStatementEntityUpdate merged = updateA.merge(updateB);
         assertEquals(statementGroups, merged.getAddedStatementGroups().stream().collect(Collectors.toSet()));
@@ -150,13 +151,14 @@ public class ItemUpdateTest {
 
     @Test
     public void testGroupBySubject() {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(newSubject).addStatement(statement1).build();
-    	TermedStatementEntityUpdate updateB = new ItemUpdateBuilder(sameNewSubject).addStatement(statement2).build();
-        TermedStatementEntityUpdate updateC = new ItemUpdateBuilder(existingSubject).addLabel(label, true).build();
-        TermedStatementEntityUpdate updateD = new ItemUpdateBuilder(matchedSubject).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(newSubject).addStatement(statement1).build();
+        TermedStatementEntityUpdate updateB = new TermedStatementEntityUpdateBuilder(sameNewSubject).addStatement(statement2).build();
+        TermedStatementEntityUpdate updateC = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label, true).build();
+        TermedStatementEntityUpdate updateD = new TermedStatementEntityUpdateBuilder(matchedSubject).build();
         Map<EntityIdValue, TermedStatementEntityUpdate> grouped = TermedStatementEntityUpdate
                 .groupBySubject(Arrays.asList(updateA, updateB, updateC, updateD));
-        TermedStatementEntityUpdate mergedUpdate = new ItemUpdateBuilder(newSubject).addStatement(statement1).addStatement(statement2)
+        TermedStatementEntityUpdate mergedUpdate = new TermedStatementEntityUpdateBuilder(newSubject).addStatement(statement1)
+                .addStatement(statement2)
                 .build();
         Map<EntityIdValue, TermedStatementEntityUpdate> expected = new HashMap<>();
         expected.put(newSubject, mergedUpdate);
@@ -168,100 +170,108 @@ public class ItemUpdateTest {
     public void testNormalizeTerms() {
         MonolingualTextValue aliasEn = Datamodel.makeMonolingualTextValue("alias", "en");
         MonolingualTextValue aliasFr = Datamodel.makeMonolingualTextValue("coucou", "fr");
-        TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(newSubject).addLabel(label, true).addAlias(aliasEn).addAlias(aliasFr)
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(newSubject).addLabel(label, true).addAlias(aliasEn)
+                .addAlias(aliasFr)
                 .build();
         assertFalse(updateA.isNull());
         TermedStatementEntityUpdate normalized = updateA.normalizeLabelsAndAliases();
-        TermedStatementEntityUpdate expectedUpdate = new ItemUpdateBuilder(newSubject).addLabel(label, true).addAlias(aliasEn)
+        TermedStatementEntityUpdate expectedUpdate = new TermedStatementEntityUpdateBuilder(newSubject).addLabel(label, true)
+                .addAlias(aliasEn)
                 .addLabel(aliasFr, true).build();
         assertEquals(expectedUpdate, normalized);
     }
-    
+
     @Test
     public void testMergeLabels() {
-    	MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
+        MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
         MonolingualTextValue label2 = Datamodel.makeMonolingualTextValue("second label", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addLabel(label1, true).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addLabel(label2, true).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label1, true).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label2, true).build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(label2), merged.getLabels());
     }
-    
+
     @Test
     public void testMergeLabelsIfNew() {
-    	MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
+        MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
         MonolingualTextValue label2 = Datamodel.makeMonolingualTextValue("second label", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addLabel(label1, false).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addLabel(label2, false).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label1, false).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label2, false).build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(label1), merged.getLabelsIfNew());
         assertEquals(Collections.emptySet(), merged.getLabels());
     }
-    
+
     @Test
     public void testMergeLabelsIfNewOverriding() {
-    	MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
+        MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
         MonolingualTextValue label2 = Datamodel.makeMonolingualTextValue("second label", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addLabel(label1, true).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addLabel(label2, false).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label1, true).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label2, false).build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(label1), merged.getLabels());
         assertEquals(Collections.emptySet(), merged.getLabelsIfNew());
     }
-    
+
     @Test
     public void testMergeLabelsIfNewOverriding2() {
-    	MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
+        MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
         MonolingualTextValue label2 = Datamodel.makeMonolingualTextValue("second label", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addLabel(label1, false).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addLabel(label2, true).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label1, false).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addLabel(label2, true).build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(label2), merged.getLabels());
         assertEquals(Collections.emptySet(), merged.getLabelsIfNew());
     }
-    
+
     @Test
     public void testMergeDescriptionsIfNew() {
-    	MonolingualTextValue description1 = Datamodel.makeMonolingualTextValue("first description", "en");
+        MonolingualTextValue description1 = Datamodel.makeMonolingualTextValue("first description", "en");
         MonolingualTextValue description2 = Datamodel.makeMonolingualTextValue("second description", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addDescription(description1, false).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addDescription(description2, false).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addDescription(description1, false)
+                .build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addDescription(description2, false)
+                .build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(description1), merged.getDescriptionsIfNew());
         assertEquals(Collections.emptySet(), merged.getDescriptions());
         assertFalse(merged.isEmpty());
     }
-    
+
     @Test
     public void testMergeDescriptionsIfNewOverriding() {
-    	MonolingualTextValue description1 = Datamodel.makeMonolingualTextValue("first description", "en");
+        MonolingualTextValue description1 = Datamodel.makeMonolingualTextValue("first description", "en");
         MonolingualTextValue description2 = Datamodel.makeMonolingualTextValue("second description", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addDescription(description1, true).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addDescription(description2, false).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addDescription(description1, true)
+                .build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addDescription(description2, false)
+                .build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(description1), merged.getDescriptions());
         assertEquals(Collections.emptySet(), merged.getDescriptionsIfNew());
     }
-    
+
     @Test
     public void testMergeDescriptionsIfNewOverriding2() {
-    	MonolingualTextValue description1 = Datamodel.makeMonolingualTextValue("first description", "en");
+        MonolingualTextValue description1 = Datamodel.makeMonolingualTextValue("first description", "en");
         MonolingualTextValue description2 = Datamodel.makeMonolingualTextValue("second description", "en");
-        TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingSubject).addDescription(description1, false).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingSubject).addDescription(description2, true).build();
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingSubject).addDescription(description1, false)
+                .build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingSubject).addDescription(description2, true)
+                .build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singleton(description2), merged.getDescriptions());
         assertEquals(Collections.emptySet(), merged.getDescriptionsIfNew());
     }
-    
+
     @Test
     public void testConstructOverridingLabels() {
-    	MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
+        MonolingualTextValue label1 = Datamodel.makeMonolingualTextValue("first label", "en");
         MonolingualTextValue label2 = Datamodel.makeMonolingualTextValue("second label", "en");
-        TermedStatementEntityUpdate update = new ItemUpdateBuilder(existingSubject)
-        		.addLabel(label1, false)
-        		.addLabel(label2, true)
-        		.build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(existingSubject)
+                .addLabel(label1, false)
+                .addLabel(label2, true)
+                .build();
         assertEquals(Collections.singleton(label2), update.getLabels());
         assertEquals(Collections.emptySet(), update.getLabelsIfNew());
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java
index a1a16e6d1..dd8a32b32 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.updates.scheduler;
 
 import static org.mockito.Mockito.mock;
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java
index 59501c3e5..5b5d39e05 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.updates.scheduler;
 
 import static org.testng.Assert.assertEquals;
@@ -29,7 +30,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 
 public class QuickStatementsUpdateSchedulerTest extends UpdateSchedulerTest {
@@ -37,8 +38,8 @@ public class QuickStatementsUpdateSchedulerTest extends UpdateSchedulerTest {
     @Test
     public void testNoNewItem()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoB).build();
-        TermedStatementEntityUpdate updateB = new ItemUpdateBuilder(existingIdB).addStatement(sBtoA).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoB).build();
+        TermedStatementEntityUpdate updateB = new TermedStatementEntityUpdateBuilder(existingIdB).addStatement(sBtoA).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA, updateB);
         assertEquals(Arrays.asList(updateA, updateB), scheduled);
     }
@@ -46,11 +47,12 @@ public class QuickStatementsUpdateSchedulerTest extends UpdateSchedulerTest {
     @Test
     public void testSplitUpdate()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewA).addStatement(sAtoNewB).build();
-    	TermedStatementEntityUpdate newUpdateA = new ItemUpdateBuilder(newIdA).build();
-        TermedStatementEntityUpdate newUpdateB = new ItemUpdateBuilder(newIdB).build();
-        TermedStatementEntityUpdate splitUpdateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewA).build();
-        TermedStatementEntityUpdate splitUpdateB = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewB).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewA)
+                .addStatement(sAtoNewB).build();
+        TermedStatementEntityUpdate newUpdateA = new TermedStatementEntityUpdateBuilder(newIdA).build();
+        TermedStatementEntityUpdate newUpdateB = new TermedStatementEntityUpdateBuilder(newIdB).build();
+        TermedStatementEntityUpdate splitUpdateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewA).build();
+        TermedStatementEntityUpdate splitUpdateB = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewB).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA);
         assertSetEquals(Arrays.asList(newUpdateA, splitUpdateA, newUpdateB, splitUpdateB), scheduled);
     }
@@ -58,14 +60,14 @@ public class QuickStatementsUpdateSchedulerTest extends UpdateSchedulerTest {
     @Test(expectedExceptions = ImpossibleSchedulingException.class)
     public void testImpossibleForQS()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(newIdA).addStatement(sNewAtoNewB).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(newIdA).addStatement(sNewAtoNewB).build();
         schedule(update);
     }
 
     @Test
     public void testSelfEditOnNewITem()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate update = new ItemUpdateBuilder(newIdA).addStatement(sNewAtoNewA).build();
+        TermedStatementEntityUpdate update = new TermedStatementEntityUpdateBuilder(newIdA).addStatement(sNewAtoNewA).build();
         assertEquals(Arrays.asList(update), schedule(update));
     }
 
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java
index 664007268..ccebe827b 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.updates.scheduler;
 
 import static org.testng.Assert.assertEquals;
@@ -32,7 +33,7 @@ import java.util.stream.Collectors;
 
 import org.openrefine.wikidata.testing.TestingData;
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 import org.wikidata.wdtk.datamodel.helpers.Datamodel;
 import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
@@ -67,17 +68,17 @@ public abstract class UpdateSchedulerTest {
     @Test
     public void testNewItemNotMentioned()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewA).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewA).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA);
-        TermedStatementEntityUpdate newUpdate = new ItemUpdateBuilder(newIdA).build();
+        TermedStatementEntityUpdate newUpdate = new TermedStatementEntityUpdateBuilder(newIdA).build();
         assertEquals(Arrays.asList(newUpdate, updateA), scheduled);
     }
 
     @Test
     public void testNewItemMentioned()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewA).build();
-    	TermedStatementEntityUpdate newUpdate = new ItemUpdateBuilder(newIdA).addStatement(sNewAtoB).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewA).build();
+        TermedStatementEntityUpdate newUpdate = new TermedStatementEntityUpdateBuilder(newIdA).addStatement(sNewAtoB).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA, newUpdate);
         assertEquals(Arrays.asList(newUpdate, updateA), scheduled);
     }
@@ -85,8 +86,8 @@ public abstract class UpdateSchedulerTest {
     @Test
     public void testMerge()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(existingIdA).addStatement(sAtoB).build();
-        TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(existingIdA)
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoB).build();
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(existingIdA)
                 .addLabel(Datamodel.makeMonolingualTextValue("hello", "fr"), true).addStatement(sAtoB).build();
         TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singletonList(merged), schedule(update1, update2));
@@ -95,11 +96,13 @@ public abstract class UpdateSchedulerTest {
     @Test
     public void testMergeNew()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate update1 = new ItemUpdateBuilder(newIdA).addLabel(Datamodel.makeMonolingualTextValue("hello", "fr"), true)
+        TermedStatementEntityUpdate update1 = new TermedStatementEntityUpdateBuilder(newIdA)
+                .addLabel(Datamodel.makeMonolingualTextValue("hello", "fr"), true)
                 .addStatement(sNewAtoB).build();
-    	TermedStatementEntityUpdate update2 = new ItemUpdateBuilder(newIdA).addLabel(Datamodel.makeMonolingualTextValue("hello", "fr"), true)
+        TermedStatementEntityUpdate update2 = new TermedStatementEntityUpdateBuilder(newIdA)
+                .addLabel(Datamodel.makeMonolingualTextValue("hello", "fr"), true)
                 .build();
-    	TermedStatementEntityUpdate merged = update1.merge(update2);
+        TermedStatementEntityUpdate merged = update1.merge(update2);
         assertEquals(Collections.singletonList(merged), schedule(update1, update2));
     }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java
index dc20f8766..7e15fe512 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ******************************************************************************/
+
 package org.openrefine.wikidata.updates.scheduler;
 
 import static org.testng.Assert.assertEquals;
@@ -29,7 +30,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.openrefine.wikidata.updates.TermedStatementEntityUpdate;
-import org.openrefine.wikidata.updates.ItemUpdateBuilder;
+import org.openrefine.wikidata.updates.TermedStatementEntityUpdateBuilder;
 import org.testng.annotations.Test;
 
 public class WikibaseAPIUpdateSchedulerTest extends UpdateSchedulerTest {
@@ -37,8 +38,8 @@ public class WikibaseAPIUpdateSchedulerTest extends UpdateSchedulerTest {
     @Test
     public void testOrderPreserved()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoB).build();
-    	TermedStatementEntityUpdate updateB = new ItemUpdateBuilder(existingIdB).addStatement(sBtoA).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoB).build();
+        TermedStatementEntityUpdate updateB = new TermedStatementEntityUpdateBuilder(existingIdB).addStatement(sBtoA).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA, updateB);
         assertEquals(Arrays.asList(updateA, updateB), scheduled);
     }
@@ -46,9 +47,10 @@ public class WikibaseAPIUpdateSchedulerTest extends UpdateSchedulerTest {
     @Test
     public void testUpdateIsNotSplit()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewA).addStatement(sAtoNewB).build();
-    	TermedStatementEntityUpdate newUpdateA = new ItemUpdateBuilder(newIdA).build();
-    	TermedStatementEntityUpdate newUpdateB = new ItemUpdateBuilder(newIdB).build();
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewA)
+                .addStatement(sAtoNewB).build();
+        TermedStatementEntityUpdate newUpdateA = new TermedStatementEntityUpdateBuilder(newIdA).build();
+        TermedStatementEntityUpdate newUpdateB = new TermedStatementEntityUpdateBuilder(newIdB).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA);
         assertSetEquals(Arrays.asList(newUpdateA, newUpdateB, updateA), scheduled);
     }
@@ -56,10 +58,11 @@ public class WikibaseAPIUpdateSchedulerTest extends UpdateSchedulerTest {
     @Test
     public void testMixedUpdate()
             throws ImpossibleSchedulingException {
-    	TermedStatementEntityUpdate updateA = new ItemUpdateBuilder(existingIdA).addStatement(sAtoNewA).addStatement(sAtoNewB)
+        TermedStatementEntityUpdate updateA = new TermedStatementEntityUpdateBuilder(existingIdA).addStatement(sAtoNewA)
+                .addStatement(sAtoNewB)
                 .addStatement(sAtoB).build();
-    	TermedStatementEntityUpdate newUpdateA = new ItemUpdateBuilder(newIdA).addStatement(sNewAtoB).build();
-    	TermedStatementEntityUpdate newUpdateB = new ItemUpdateBuilder(newIdB).build();
+        TermedStatementEntityUpdate newUpdateA = new TermedStatementEntityUpdateBuilder(newIdA).addStatement(sNewAtoB).build();
+        TermedStatementEntityUpdate newUpdateB = new TermedStatementEntityUpdateBuilder(newIdB).build();
         List<TermedStatementEntityUpdate> scheduled = schedule(updateA, newUpdateA);
         assertEquals(Arrays.asList(newUpdateA, newUpdateB, updateA), scheduled);
     }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheStub.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheStub.java
index 5d54423b0..8cd1de9ac 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheStub.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheStub.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.utils;
 
 import java.io.InputStream;
@@ -14,35 +15,34 @@ import org.wikidata.wdtk.wikibaseapi.BasicApiConnection;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
- * Stub of EntityCache class, to fetch entities from a local cache instead
- * of the live site.
+ * Stub of EntityCache class, to fetch entities from a local cache instead of the live site.
  * 
  * @author Antonin Delpeuch
  */
 public class EntityCacheStub extends EntityCache {
 
-	private ObjectMapper mapper =  new DatamodelMapper(Datamodel.SITE_WIKIDATA);
-	
-	public EntityCacheStub() {
-		super(null, null);
-	}
-	
-	@Override
-	public EntityDocument get(EntityIdValue id) {
-        String filename = "entitycache/entitycache-"+id.getId()+".json";
+    private ObjectMapper mapper = new DatamodelMapper(Datamodel.SITE_WIKIDATA);
+
+    public EntityCacheStub() {
+        super(null, null);
+    }
+
+    @Override
+    public EntityDocument get(EntityIdValue id) {
+        String filename = "entitycache/entitycache-" + id.getId() + ".json";
         InputStream stream = EntityCacheStub.class.getClassLoader().getResourceAsStream(filename);
         try {
-        	// TODO This should ideally be hidden in a helper:
-        	// https://github.com/Wikidata/Wikidata-Toolkit/issues/471
-			return mapper.readValue(stream, EntityDocumentImpl.class);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+            // TODO This should ideally be hidden in a helper:
+            // https://github.com/Wikidata/Wikidata-Toolkit/issues/471
+            return mapper.readValue(stream, EntityDocumentImpl.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return null;
     }
 
     @Override
-	public List<EntityDocument> getMultipleDocuments(List<EntityIdValue> entityIds) {
-		return entityIds.stream().map(id -> get(id)).collect(Collectors.toList());
-	}
+    public List<EntityDocument> getMultipleDocuments(List<EntityIdValue> entityIds) {
+        return entityIds.stream().map(id -> get(id)).collect(Collectors.toList());
+    }
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheTests.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheTests.java
index 6ead0841a..9af08bea1 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheTests.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/EntityCacheTests.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.utils;
 
 import org.testng.Assert;
@@ -23,65 +24,65 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class EntityCacheTests {
-	
-	@Test
-	public void testGet() throws MediaWikiApiErrorException, IOException {
-		WikibaseDataFetcher fetcher = mock(WikibaseDataFetcher.class);
-		PropertyIdValue id = Datamodel.makeWikidataPropertyIdValue("P42");
-		PropertyDocument doc = Datamodel.makePropertyDocument(id, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
-		when(fetcher.getEntityDocument(id.getId())).thenReturn(doc);
-		
-		EntityCache SUT = new EntityCache(fetcher);
-		Assert.assertEquals(SUT.get(id), doc);
-		// try another time, it is now cached
-		Assert.assertEquals(SUT.get(id), doc);
-		
-		// the fetcher was only called once thanks to caching
-		verify(fetcher, times(1)).getEntityDocument(id.getId());
-	}
 
-	@Test
-	public void testGetAll() throws MediaWikiApiErrorException, IOException, ExecutionException {
-		WikibaseDataFetcher fetcher = mock(WikibaseDataFetcher.class);
-		PropertyIdValue idA = Datamodel.makeWikidataPropertyIdValue("P42");
-		PropertyIdValue idB = Datamodel.makeWikidataPropertyIdValue("P43");
-		PropertyIdValue idC = Datamodel.makeWikidataPropertyIdValue("P44");
-		PropertyIdValue idD = Datamodel.makeWikidataPropertyIdValue("P45");
+    @Test
+    public void testGet() throws MediaWikiApiErrorException, IOException {
+        WikibaseDataFetcher fetcher = mock(WikibaseDataFetcher.class);
+        PropertyIdValue id = Datamodel.makeWikidataPropertyIdValue("P42");
+        PropertyDocument doc = Datamodel.makePropertyDocument(id, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
+        when(fetcher.getEntityDocument(id.getId())).thenReturn(doc);
 
-		PropertyDocument docA = Datamodel.makePropertyDocument(idA, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
-		PropertyDocument docB = Datamodel.makePropertyDocument(idB, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
-		PropertyDocument docC = Datamodel.makePropertyDocument(idC, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
-		PropertyDocument docD = Datamodel.makePropertyDocument(idD, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
+        EntityCache SUT = new EntityCache(fetcher);
+        Assert.assertEquals(SUT.get(id), doc);
+        // try another time, it is now cached
+        Assert.assertEquals(SUT.get(id), doc);
 
-		EntityCache SUT = new EntityCache(fetcher);
+        // the fetcher was only called once thanks to caching
+        verify(fetcher, times(1)).getEntityDocument(id.getId());
+    }
 
-		List<String> entityIdListA = Arrays.asList(idA.getId(), idB.getId());
-		List<String> entityIdListB = Arrays.asList(idC.getId(), idD.getId());
-		List<String> entityIdListC = Arrays.asList(idB.getId(), idC.getId());
+    @Test
+    public void testGetAll() throws MediaWikiApiErrorException, IOException, ExecutionException {
+        WikibaseDataFetcher fetcher = mock(WikibaseDataFetcher.class);
+        PropertyIdValue idA = Datamodel.makeWikidataPropertyIdValue("P42");
+        PropertyIdValue idB = Datamodel.makeWikidataPropertyIdValue("P43");
+        PropertyIdValue idC = Datamodel.makeWikidataPropertyIdValue("P44");
+        PropertyIdValue idD = Datamodel.makeWikidataPropertyIdValue("P45");
 
-		List<EntityDocument> docListA = Arrays.asList(docA, docB);
-		List<EntityDocument> docListB = Arrays.asList(docC, docD);
-		List<EntityDocument> docListC = Arrays.asList(docB, docC);
+        PropertyDocument docA = Datamodel.makePropertyDocument(idA, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
+        PropertyDocument docB = Datamodel.makePropertyDocument(idB, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
+        PropertyDocument docC = Datamodel.makePropertyDocument(idC, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
+        PropertyDocument docD = Datamodel.makePropertyDocument(idD, Datamodel.makeDatatypeIdValue(DatatypeIdValue.DT_GEO_SHAPE));
 
-		Map<String, EntityDocument> docMapA = new HashMap<>();
-		docMapA.put(idA.getId(), docA);
-		docMapA.put(idB.getId(), docB);
-		Map<String, EntityDocument> docMapB = new HashMap<>();
-		docMapB.put(idC.getId(), docC);
-		docMapB.put(idD.getId(), docD);
-		Map<String, EntityDocument> docMapC = new HashMap<>();
-		docMapC.put(idB.getId(), docB);
-		docMapC.put(idC.getId(), docC);
+        EntityCache SUT = new EntityCache(fetcher);
 
-		when(fetcher.getEntityDocuments(entityIdListA)).thenReturn(docMapA);
-		when(fetcher.getEntityDocuments(entityIdListB)).thenReturn(docMapB);
-		when(fetcher.getEntityDocuments(entityIdListC)).thenReturn(docMapC);
+        List<String> entityIdListA = Arrays.asList(idA.getId(), idB.getId());
+        List<String> entityIdListB = Arrays.asList(idC.getId(), idD.getId());
+        List<String> entityIdListC = Arrays.asList(idB.getId(), idC.getId());
 
-		Assert.assertEquals(SUT.getMultipleDocuments(Arrays.asList(idA, idB)), docListA);
-		Assert.assertEquals(SUT.getMultipleDocuments(Arrays.asList(idC, idD)), docListB);
-		Assert.assertEquals(SUT.getMultipleDocuments(Arrays.asList(idB, idC)), docListC);
+        List<EntityDocument> docListA = Arrays.asList(docA, docB);
+        List<EntityDocument> docListB = Arrays.asList(docC, docD);
+        List<EntityDocument> docListC = Arrays.asList(docB, docC);
 
-		verify(fetcher, times(0)).getEntityDocuments(entityIdListC);
-	}
+        Map<String, EntityDocument> docMapA = new HashMap<>();
+        docMapA.put(idA.getId(), docA);
+        docMapA.put(idB.getId(), docB);
+        Map<String, EntityDocument> docMapB = new HashMap<>();
+        docMapB.put(idC.getId(), docC);
+        docMapB.put(idD.getId(), docD);
+        Map<String, EntityDocument> docMapC = new HashMap<>();
+        docMapC.put(idB.getId(), docB);
+        docMapC.put(idC.getId(), docC);
+
+        when(fetcher.getEntityDocuments(entityIdListA)).thenReturn(docMapA);
+        when(fetcher.getEntityDocuments(entityIdListB)).thenReturn(docMapB);
+        when(fetcher.getEntityDocuments(entityIdListC)).thenReturn(docMapC);
+
+        Assert.assertEquals(SUT.getMultipleDocuments(Arrays.asList(idA, idB)), docListA);
+        Assert.assertEquals(SUT.getMultipleDocuments(Arrays.asList(idC, idD)), docListB);
+        Assert.assertEquals(SUT.getMultipleDocuments(Arrays.asList(idB, idC)), docListC);
+
+        verify(fetcher, times(0)).getEntityDocuments(entityIdListC);
+    }
 
 }
diff --git a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/SnakUtilsTests.java b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/SnakUtilsTests.java
index 3a0ece370..7a285d6d3 100644
--- a/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/SnakUtilsTests.java
+++ b/OpenRefine/extensions/wikidata/tests/src/org/openrefine/wikidata/utils/SnakUtilsTests.java
@@ -1,3 +1,4 @@
+
 package org.openrefine.wikidata.utils;
 
 import java.util.Arrays;
@@ -12,29 +13,28 @@ import org.wikidata.wdtk.datamodel.interfaces.SnakGroup;
 import org.wikidata.wdtk.datamodel.interfaces.StringValue;
 
 public class SnakUtilsTests {
-    
+
     PropertyIdValue pidA = Datamodel.makeWikidataPropertyIdValue("P1");
     PropertyIdValue pidB = Datamodel.makeWikidataPropertyIdValue("P2");
     PropertyIdValue pidC = Datamodel.makeWikidataPropertyIdValue("P3");
     StringValue value1 = Datamodel.makeStringValue("value1");
     StringValue value2 = Datamodel.makeStringValue("value2");
-    
+
     Snak snakA1 = Datamodel.makeValueSnak(pidA, value1);
     Snak snakA2 = Datamodel.makeValueSnak(pidA, value2);
     Snak snakB1 = Datamodel.makeValueSnak(pidB, value1);
     Snak snakC1 = Datamodel.makeValueSnak(pidC, value1);
     Snak snakC2 = Datamodel.makeValueSnak(pidC, value2);
-    
+
     @Test
     public void testGroupSnaks() {
         List<SnakGroup> snakGroups = SnakUtils.groupSnaks(Arrays.asList(snakA2, snakB1, snakC1, snakA1, snakC2));
-        
+
         List<SnakGroup> expected = Arrays.asList(
                 Datamodel.makeSnakGroup(Arrays.asList(snakA2, snakA1)),
                 Datamodel.makeSnakGroup(Arrays.asList(snakB1)),
-                Datamodel.makeSnakGroup(Arrays.asList(snakC1, snakC2))
-                );
-        
+                Datamodel.makeSnakGroup(Arrays.asList(snakC1, snakC2)));
+
         Assert.assertEquals(snakGroups, expected);
     }
 }
diff --git a/OpenRefine/lgtm.yml b/OpenRefine/lgtm.yml
deleted file mode 100644
index c4dff1d6e..000000000
--- a/OpenRefine/lgtm.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-extraction:
-  java:
-    index:
-      build_command:
-      - mvn clean test-compile
-  javascript:
-    index:
-      exclude:
-        - main/webapp/modules/core/externals
-
-queries:
-  - exclude: java/insecure-cookie
diff --git a/OpenRefine/licenses/apache2.0.LICENSE.txt b/OpenRefine/licenses/apache2.0.LICENSE.txt
deleted file mode 100644
index d64569567..000000000
--- a/OpenRefine/licenses/apache2.0.LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/OpenRefine/licenses/arithcode.LICENSE.txt b/OpenRefine/licenses/arithcode.LICENSE.txt
deleted file mode 100644
index de5381ef9..000000000
--- a/OpenRefine/licenses/arithcode.LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2002, Bob Carpenter.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * 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.  
-
-    * Neither the name of colloquial.com nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-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
-OWNER 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.
\ No newline at end of file
diff --git a/OpenRefine/licenses/dom4j.LICENSE.txt b/OpenRefine/licenses/dom4j.LICENSE.txt
deleted file mode 100644
index c86228f19..000000000
--- a/OpenRefine/licenses/dom4j.LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Redistribution and use of this software and associated documentation ("Software"), 
-with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain copyright statements and notices. 
-Redistributions must also contain a copy of this document.
-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.
-3. The name "DOM4J" must not be used to endorse or promote products derived from this 
-Software without prior written permission of MetaStuff, Ltd. For written permission, 
-please contact dom4j-info@metastuff.com.
-4. Products derived from this Software may not be called "DOM4J" nor may "DOM4J" 
-appear in their names without prior written permission of MetaStuff, Ltd. DOM4J is a 
-registered trademark of MetaStuff, Ltd.
-5. Due credit should be given to the DOM4J Project - http://www.dom4j.org
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED 
-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 
-METASTUFF, LTD. OR ITS 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.
-
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
\ No newline at end of file
diff --git a/OpenRefine/licenses/icu4j.LICENSE.txt b/OpenRefine/licenses/icu4j.LICENSE.txt
deleted file mode 100644
index 677f38878..000000000
--- a/OpenRefine/licenses/icu4j.LICENSE.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-ICU License - ICU 1.8.1 and later
-
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright (c) 1995-2009 International Business Machines Corporation and others
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this 
-software and associated documentation files (the "Software"), to deal in the Software 
-without restriction, including without limitation the rights to use, copy, modify, merge, 
-publish, distribute, and/or sell copies of the Software, and to permit persons to whom 
-the Software is furnished to do so, provided that the above copyright notice(s) and this 
-permission notice appear in all copies of the Software and that both the above copyright 
-notice(s) and this permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
-PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT 
-HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL 
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF 
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS 
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used 
-in advertising or otherwise to promote the sale, use or other dealings in this Software 
-without prior written authorization of the copyright holder.
-
diff --git a/OpenRefine/licenses/jrdf.LICENSE.txt b/OpenRefine/licenses/jrdf.LICENSE.txt
deleted file mode 100644
index 49c4386d7..000000000
--- a/OpenRefine/licenses/jrdf.LICENSE.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $Header$
- * $Revision: 205 $
- * $Date: 2005-06-22 21:16:18 +1000 (Wed, 22 Jun 2005) $
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2003-2005 The JRDF Project.  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.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        the JRDF Project (http://jrdf.sf.net/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The JRDF Project" and "JRDF" must not be used to endorse
- *    or promote products derived from this software without prior written
- *    permission. For written permission, please contact
- *    newmana@users.sourceforge.net.
- *
- * 5. Products derived from this software may not be called "JRDF"
- *    nor may "JRDF" appear in their names without prior written
- *    permission of the JRDF Project.
- *
- * THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the JRDF Project.  For more
- * information on JRDF, please see <http://jrdf.sourceforge.net/>.
- */
diff --git a/OpenRefine/licenses/jsoup.LICENSE.txt b/OpenRefine/licenses/jsoup.LICENSE.txt
deleted file mode 100644
index 5203fd0a4..000000000
--- a/OpenRefine/licenses/jsoup.LICENSE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-jsoup License
-The jsoup code-base (include source and compiled packages) are distributed under the open source MIT license as described below.
-
-The MIT License
-Copyright (c) 2009, 2010 Jonathan Hedley (jonathan@hedley.net)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/OpenRefine/licenses/marc4j.LICENSE.txt b/OpenRefine/licenses/marc4j.LICENSE.txt
deleted file mode 100644
index b1e3f5a26..000000000
--- a/OpenRefine/licenses/marc4j.LICENSE.txt
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/OpenRefine/licenses/mockito.LICENSE.txt b/OpenRefine/licenses/mockito.LICENSE.txt
deleted file mode 100644
index e0840a446..000000000
--- a/OpenRefine/licenses/mockito.LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2007 Mockito contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/OpenRefine/licenses/secondstring.LICENSE.txt b/OpenRefine/licenses/secondstring.LICENSE.txt
deleted file mode 100644
index b65a2af97..000000000
--- a/OpenRefine/licenses/secondstring.LICENSE.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Copyright (c) 2003 Carnegie Mellon University
-All rights reserved.
-Developed by: 		Center for Automated Learning and Discovery
-                      	Carnegie Mellon University
-                        http://www.cald.cs.cmu.edu
-
-     The design and implementation of this software was supported in
-     part by National Science Foundation Grant No. EIA-0131884 to the
-     National Institute of Statistical Sciences, and by a contract
-     from the Army Research Office to the Center for Computer and
-     Communications Security with Carnegie Mellon University.
-
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal with the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimers.
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimers in the
-documentation and/or other materials provided with the distribution.
-Neither the names of the Center for Automated Learning and Discovery,
-or Carnegie Mellon University, nor the names of its contributors may
-be used to endorse or promote products derived from this Software
-without specific prior written permission.  THE SOFTWARE IS PROVIDED
-"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS WITH THE SOFTWARE.
-
-[This is an instance of the University of Illinois/NCSA Open Source
-agreement, obtained from http://www.opensource.org/licenses/UoI-NCSA.php]
-
diff --git a/OpenRefine/licenses/simile.LICENSE.txt b/OpenRefine/licenses/simile.LICENSE.txt
deleted file mode 100644
index 69bf77c10..000000000
--- a/OpenRefine/licenses/simile.LICENSE.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  (c) Copyright Massachusetts Institute of Technology & Contributors.
- *
- * 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.
- * 
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- */
diff --git a/OpenRefine/licenses/slf4j.LICENSE.txt b/OpenRefine/licenses/slf4j.LICENSE.txt
deleted file mode 100644
index 29182a587..000000000
--- a/OpenRefine/licenses/slf4j.LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
- Copyright (c) 2004-2008 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free  of charge, to any person obtaining
- a  copy  of this  software  and  associated  documentation files  (the
- "Software"), to  deal in  the Software without  restriction, including
- without limitation  the rights to  use, copy, modify,  merge, publish,
- distribute,  sublicense, and/or sell  copies of  the Software,  and to
- permit persons to whom the Software  is furnished to do so, subject to
- the following conditions:
- 
- The  above  copyright  notice  and  this permission  notice  shall  be
- included in all copies or substantial portions of the Software.
- 
- THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
- EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
- MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
\ No newline at end of file
diff --git a/OpenRefine/logo.svg b/OpenRefine/logo.svg
deleted file mode 100644
index 484fa3f67..000000000
--- a/OpenRefine/logo.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<svg width="297" height="297" viewBox="0 0 297 297" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g filter="url(#filter0_d_315_106)">
-<circle cx="148.5" cy="144.5" r="144.5" fill="#E5E5E5"/>
-</g>
-<rect x="20" y="16" width="257" height="257" fill="url(#pattern0)"/>
-<rect x="50" y="39" width="198" height="212" fill="url(#pattern1)"/>
-<defs>
-<filter id="filter0_d_315_106" x="0" y="0" width="297" height="297" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="4"/>
-<feGaussianBlur stdDeviation="2"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_315_106"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_315_106" result="shape"/>
-</filter>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_315_106" transform="scale(0.000488281)"/>
-</pattern>
-<pattern id="pattern1" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image1_315_106" transform="translate(-0.00077862) scale(0.00223064 0.00208333)"/>
-</pattern>
-<image id="image0_315_106" width="2048" height="2048" xlink:href="data:image/png;base64,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JEmSzlJE/En180VgiWXm91UPKkmSJEmSJEmSJElnLyJ+q/r5IrDEuq57RvWgkiRJkiRJkiRJknT2MvPF1c8XgSWWmV9bPagkSZIkSZIkSZIknb2IeEH180VgiXVd96XVg0qSJEmSJEmSJEnS2YuI51Y/XwSW2GQy+bzqQSVJkiRJkiRJkiTp7HVdd7T6+SKwxGaz2WOqB5UkSZIkSZIkSZKks5eZz6p+vggsse3t7Q+tHlSSJEmSJEmSJEmSzl5mPq36+SKwxE6fPn1ZZt5SPawkSZIkSZIkSZIk3XkR8YXVzxeBJRcRr68eVpIkSZIkSZIkSZLuvNls9onVzxaBJRcRL6seVpIkSZIkSZIkSZLuvGPHjt2/+tkisOQy88XVw0qSJEmSJEmSJEnSHRcRN8/n80urny0CS6619mPVA0uSJEmSJEmSJEnSnfaa6ueKwAqIiFyCgSVJkiRJkiRJkiTpDoqIl1Y/VwRWQNd1z6geWJIkSZIkSZIkSZLuuMx8UfVzRWAFdN3/z96dBll21neer1X7BgIJCYlF7LsROwixqQ3YlO3pcHmZaNfMdDiqbfeYjB6Pu+x2j+f5/Z5z7pI3M6vqdmX13HDklJ3Ts8TpaXrsAsO0MAkYbHYDFpvYBBiE0L5vVXXmhbOGTZmqUmXm/9xzv5+I7xuCgKzMZznnufeem38uesEiIiIiIiIiIiIiIiIiopWTtC/6dUUAY6Db7T4zesEiIiIiIiIiIiIiIiIiopXLOf929OuKAMbA0tLStpTSg9GLFhERERERERERERERERE9cmVZviX6dUUAY0LSl6MXLSIiIiIiIiIiIiIiIiJ65Pr9/mXRrykCGBO2/yJ60SIiIiIiIiIiIiIiIiKin872PXVdb45+TRHAmJA0E71wEREREREREREREREREdFPJ+kz0a8nAhgjkv5F9MJFRERERERERERERERERD+d7f8z+vVEAGOkLMs3RS9cRERERERERERERERERPTT2Vb064kAxki/3780euEiIiIiIiIiIiIiIiIiop+uKIpfj349EcCYkXRj9OJFRERERERERERERERERD9ev99/TvRriQDGjKS/jF68iIiIiIiIiIiIiIiIiOiHSbqzrust0a8lAhgztnP0AkZEREREREREREREREREP8z2B6JfRwQwhnLOvxS9gBERERERERERERER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"/>
-<image id="image1_315_106" width="449" height="480" xlink:href="data:image/png;base64,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"/>
-</defs>
-</svg>
diff --git a/OpenRefine/main/pom.xml b/OpenRefine/main/pom.xml
index 8e7825a98..ba5826553 100644
--- a/OpenRefine/main/pom.xml
+++ b/OpenRefine/main/pom.xml
@@ -155,6 +155,20 @@
       <groupId>org.openrefine.dependencies</groupId>
       <artifactId>butterfly</artifactId>
       <version>${butterfly.version}</version>
+      <exclusions>
+	<exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+	  <artifactId>log4j-1.2-api</artifactId>
+	</exclusion>
+	<exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+	  <artifactId>log4j-slf4j-impl</artifactId>
+	</exclusion>
+	<exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+	  <artifactId>log4j-core</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -166,15 +180,11 @@
       <artifactId>jackson-annotations</artifactId>
       <version>${jackson.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -230,11 +240,23 @@
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
       <version>${poi.version}</version>
+      <exclusions>
+	<exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+	  <artifactId>log4j-api</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
       <version>${poi.version}</version>
+      <exclusions>
+	<exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+	  <artifactId>log4j-api</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.odftoolkit</groupId>
@@ -257,6 +279,12 @@
       <groupId>org.openrefine.dependencies</groupId>
       <artifactId>vicino</artifactId>
       <version>${vicino.version}</version>
+      <exclusions>
+	<exclusion>
+	  <groupId>log4j</groupId>
+	  <artifactId>log4j</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.clojure</groupId>
@@ -328,29 +356,29 @@
       <version>${testng.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-testng</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
       <version>${okhttp.version}</version>
       <scope>test</scope>
-     </dependency>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
       <version>${httpmime.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/OpenRefine/main/src/com/google/refine/exporters/sql/SqlCreateBuilder.java b/OpenRefine/main/src/com/google/refine/exporters/sql/SqlCreateBuilder.java
old mode 100644
new mode 100755
diff --git a/OpenRefine/main/src/com/google/refine/exporters/sql/SqlData.java b/OpenRefine/main/src/com/google/refine/exporters/sql/SqlData.java
old mode 100644
new mode 100755
diff --git a/OpenRefine/main/src/com/google/refine/exporters/sql/SqlExporter.java b/OpenRefine/main/src/com/google/refine/exporters/sql/SqlExporter.java
old mode 100644
new mode 100755
diff --git a/OpenRefine/main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java b/OpenRefine/main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java
old mode 100644
new mode 100755
diff --git a/OpenRefine/main/src/com/google/refine/grel/ControlFunctionRegistry.java b/OpenRefine/main/src/com/google/refine/grel/ControlFunctionRegistry.java
index fb66b9fea..f70e6a887 100644
--- a/OpenRefine/main/src/com/google/refine/grel/ControlFunctionRegistry.java
+++ b/OpenRefine/main/src/com/google/refine/grel/ControlFunctionRegistry.java
@@ -138,8 +138,10 @@ import com.google.refine.expr.functions.xml.OwnText;
 import com.google.refine.expr.functions.xml.ParseXml;
 import com.google.refine.expr.functions.xml.SelectXml;
 import com.google.refine.expr.functions.xml.WholeText;
+import com.google.refine.expr.functions.xml.ScriptText;
 import com.google.refine.expr.functions.xml.XmlAttr;
 import com.google.refine.expr.functions.xml.XmlText;
+import com.google.refine.expr.functions.xml.Parent;
 import com.google.refine.grel.controls.Filter;
 import com.google.refine.grel.controls.ForEach;
 import com.google.refine.grel.controls.ForEachIndex;
@@ -258,6 +260,8 @@ public class ControlFunctionRegistry {
         registerFunction("innerHtml", new InnerHtml());
         registerFunction("ownText", new OwnText());
         registerFunction("wholeText", new WholeText());
+        registerFunction("parent", new Parent());
+        registerFunction("scriptText", new ScriptText());
 
         registerFunction("indexOf", new IndexOf());
         registerFunction("lastIndexOf", new LastIndexOf());
diff --git a/OpenRefine/main/src/com/google/refine/logging/IndentingLayout.java b/OpenRefine/main/src/com/google/refine/logging/IndentingLayout.java
deleted file mode 100644
index ca4f78f9c..000000000
--- a/OpenRefine/main/src/com/google/refine/logging/IndentingLayout.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-
-Copyright 2010, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * 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.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-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
-OWNER 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.logging;
-
-/*
- * Copyright (c) Massachusetts Institute of Technology, 2007 
- *
- * 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.
- * 
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- *
- *    Original code:  http://simile.mit.edu/repository/tracer/trunk/
- */
-
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * This is a special Log4j log formatter that is capable of reacting on special log messages
- * and 'indent' the logs accordingly. This is very useful to visually inspect a debug log
- * and see what calls what. An example of logs are "> method()" and "< method()" where > and <
- * are used to indicate respectively "entering" and "exiting".
- */
-public class IndentingLayout extends Layout {
-
-    protected static final int CONTEXT_SIZE = 25;
-    protected static final long MAX_DELTA = 10000;
-
-    protected Calendar calendar = Calendar.getInstance();
-    protected long previousTime = 0;
-    protected int indentation = 0;
-
-    @Override
-    public void activateOptions() {
-        // no options at this time
-    }
-
-    @Override
-    public String format(LoggingEvent event) {
-        String message = event.getRenderedMessage();
-        if (message == null) {
-            return "";
-        }
-        if (message.length() < 2) {
-            return message;
-        }
-        
-        char leader = message.charAt(0);
-        char secondLeader = message.charAt(1);
-        if ((leader == '<') && (secondLeader == ' ') && (this.indentation > 0)) {
-            this.indentation--;
-        }
-
-        // Reset buf
-        StringBuffer buf = new StringBuffer(256);
-
-        Date date = new Date();
-        long now = date.getTime();
-        calendar.setTime(date);
-
-        long delta = 0;
-        if (previousTime > 0) {
-            delta = now - previousTime;
-        }
-        previousTime = now;
-
-//        if ((previousTime == 0) || (delta > MAX_DELTA)) {
-//            buf.append('\n');
-//            indentation = 0; // reset indentation after a while, as we might
-//            // have runaway/unmatched log entries
-//        }
-
-        int hour = calendar.get(Calendar.HOUR_OF_DAY);
-        if (hour < 10) {
-            buf.append('0');
-        }
-        buf.append(hour);
-        buf.append(':');
-
-        int mins = calendar.get(Calendar.MINUTE);
-        if (mins < 10) {
-            buf.append('0');
-        }
-        buf.append(mins);
-        buf.append(':');
-
-        int secs = calendar.get(Calendar.SECOND);
-        if (secs < 10) {
-            buf.append('0');
-        }
-        buf.append(secs);
-        buf.append('.');
-
-        int millis = (int) (now % 1000);
-        if (millis < 100) {
-            buf.append('0');
-        }
-        if (millis < 10) {
-            buf.append('0');
-        }
-        buf.append(millis);
-
-        buf.append(" [");
-        String context = ((String) event.getMDC("LogEvent"));
-        if (context == null) {
-            context = event.getLoggerName();
-        }
-        if (context.length() < CONTEXT_SIZE) {
-            pad(buf, CONTEXT_SIZE - context.length(), ' ');
-            buf.append(context);
-        } else {
-            buf.append("..");
-            buf.append(context.substring(context.length() - CONTEXT_SIZE + 2));
-        }
-        buf.append("] ");
-
-        pad(buf, indentation, ' ');
-
-        buf.append(message);
-
-        buf.append(" (");
-        buf.append(delta);
-        buf.append("ms)\n");
-
-        if ((leader == '>') && (secondLeader == ' ')) {
-            indentation++;
-        }
-
-        return buf.toString();
-    }
-
-    private void pad(StringBuffer buffer, int pads, char padchar) {
-        for (int i = 0; i < pads; i++) {
-            buffer.append(padchar);
-        }
-    }
-
-    @Override
-    public boolean ignoresThrowable() {
-        return true;
-    }
-}
diff --git a/OpenRefine/main/src/com/google/refine/templating/Template.java b/OpenRefine/main/src/com/google/refine/templating/Template.java
index 8e9f40073..7e01f5b7f 100644
--- a/OpenRefine/main/src/com/google/refine/templating/Template.java
+++ b/OpenRefine/main/src/com/google/refine/templating/Template.java
@@ -87,6 +87,7 @@ public class Template {
         protected Properties bindings;
 
         public int total;
+        public int totalRows;
 
         public RowWritingVisitor(Writer writer, int limit) {
             this.limit = limit;
@@ -150,12 +151,17 @@ public class Template {
             }
         }
 
+        /**
+         * This method is modified for issue 3955
+         * Issue link: https://github.com/OpenRefine/OpenRefine/issues/3955
+         * The modification is to use the new variable totalRows instead of total
+         */
         public boolean internalVisit(Project project, int rowIndex, Row row) {
             try {
-                if (total > 0 && _separator != null) {
+                if (totalRows > 0 && _separator != null) {
                     writer.write(_separator);
                 }
-
+                totalRows++;
                 ExpressionUtils.bind(bindings, row, rowIndex, null, null);
                 for (Fragment f : _fragments) {
                     if (f instanceof StaticFragment) {
diff --git a/OpenRefine/main/src/log4j.properties b/OpenRefine/main/src/log4j.properties
deleted file mode 100644
index 0b0b7fc01..000000000
--- a/OpenRefine/main/src/log4j.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-log4j.rootLogger=INFO, console
-log4j.logger.org.eclipse.log=WARN
-log4j.logger.org.eclipse.jetty=ERROR
-log4j.logger.org.apache.http.headers=WARN
-log4j.logger.org.apache.http.impl=WARN
-log4j.logger.org.apache.http.client=WARN
-log4j.logger.velocity=WARN
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=com.google.refine.logging.IndentingLayout
-
-log4j.logger.butterfly=ERROR
-log4j.logger.refine=INFO
-log4j.logger.FileProjectManager=WARN
-
diff --git a/OpenRefine/main/tests/cypress/cypress/fixtures/reconciled-project-automatch.zip b/OpenRefine/main/tests/cypress/cypress/fixtures/reconciled-project-automatch.zip
new file mode 100644
index 000000000..8216e2401
Binary files /dev/null and b/OpenRefine/main/tests/cypress/cypress/fixtures/reconciled-project-automatch.zip differ
diff --git a/OpenRefine/main/tests/cypress/cypress/fixtures/reconciled-project-no-automatch.zip b/OpenRefine/main/tests/cypress/cypress/fixtures/reconciled-project-no-automatch.zip
new file mode 100644
index 000000000..41e9e3bb1
Binary files /dev/null and b/OpenRefine/main/tests/cypress/cypress/fixtures/reconciled-project-no-automatch.zip differ
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/clear_reconciliation_data.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/clear_reconciliation_data.spec.js
new file mode 100644
index 000000000..3f6dcf51a
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/clear_reconciliation_data.spec.js
@@ -0,0 +1,23 @@
+describe('Clear reconciliation data', () => {
+    it('Test clearing reconciliation for a reconciled dataset', () => {
+        cy.visitOpenRefine();
+        cy.navigateTo('Import project');
+        cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+        cy.get('#project-tar-file-input').attachFile('reconciled-project-automatch.zip')
+        cy.get('#import-project-button').click();
+
+        cy.columnActionClick('species', [
+            'Reconcile',
+            'Actions',
+            'Clear reconciliation data',
+        ]);
+
+        cy.get('table.data-table').should('not.to.contain', 'Choose new match');
+        cy.get('table.data-table').should('not.to.contain', 'Create new item');
+
+        // the green bar for matched item should be invisible
+        cy.get(
+            'table.data-table thead div.column-header-recon-stats-matched'
+        ).should('not.be.visible');
+    });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/create_new_item_for_each.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/create_new_item_for_each.spec.js
new file mode 100644
index 000000000..5137eb21a
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/create_new_item_for_each.spec.js
@@ -0,0 +1,30 @@
+describe('Create new item for each cell', () => {
+    it('Test discard existing reconciliation judgments', () => {
+        cy.visitOpenRefine();
+        cy.navigateTo('Import project');
+        cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+
+        cy.get('#project-tar-file-input').attachFile('reconciled-project-automatch.zip')
+        cy.get('#import-project-button').click();
+
+        // quick check to ensure some cells are matched
+
+        // Discard those judgments
+        cy.columnActionClick('species', [
+            'Reconcile',
+            'Actions',
+            'Create a new item for each cell',
+        ]);
+
+        // check notification and ensure no rows it matched anymore
+        cy.assertNotificationContainingText('Mark to create new items for 6 cells in column species, one item for each cell');
+
+        cy.getCell(0, 'species').find('.data-table-recon-new').should('to.contain', 'new');
+        cy.getCell(1, 'species').find('.data-table-recon-new').should('to.contain', 'new');
+        cy.getCell(2, 'species').find('.data-table-recon-new').should('to.contain', 'new');
+        cy.getCell(3, 'species').find('.data-table-recon-new').should('to.contain', 'new');
+        cy.getCell(4, 'species').find('.data-table-recon-new').should('to.contain', 'new');
+        cy.getCell(5, 'species').find('.data-table-recon-new').should('to.contain', 'new');
+
+    });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/discard_reconciliation_judgments.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/discard_reconciliation_judgments.spec.js
new file mode 100644
index 000000000..2a279f003
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/discard_reconciliation_judgments.spec.js
@@ -0,0 +1,37 @@
+describe('Discard reconciliation judgments', () => {
+    it('Test discard existing reconciliation judgments', () => {
+        cy.visitOpenRefine();
+        cy.navigateTo('Import project');
+        cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+
+        //we're using here the "automatched" project, to have some rows that are matched
+        cy.get('#project-tar-file-input').attachFile('reconciled-project-automatch.zip')
+        cy.get('#import-project-button').click();
+
+        // quick check to ensure some cells are matched
+        cy.getCell(0, 'species').should(
+            'to.contain',
+            'Choose new match'
+        );
+        cy.getCell(1, 'species').should(
+            'to.contain',
+            'Choose new match'
+        );
+
+        // Discard those judgments
+        cy.columnActionClick('species', [
+            'Reconcile',
+            'Actions',
+            'Discard reconciliation judgments',
+        ]);
+
+        // check notification and ensure no rows it matched anymore
+        cy.assertNotificationContainingText('Discard recon judgments for 6 cells');
+        // Check that all matches are gone (they contains Choose new match )
+        cy.get('table.data-table td .data-table-cell-content').should(
+            'not.to.contain',
+            'Choose new match'
+        );
+
+    });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/match_to_best_candidate.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/match_to_best_candidate.spec.js
new file mode 100644
index 000000000..a46f21176
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/actions/match_to_best_candidate.spec.js
@@ -0,0 +1,41 @@
+describe('Match each cell to its best candidate', () => {
+    it('Match each cell to its best candidate', () => {
+        cy.visitOpenRefine();
+        cy.navigateTo('Import project');
+        cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+
+        //we're using here the "no automatch" project, so rows are reconciled, but nothing has been matched yet
+        cy.get('#project-tar-file-input').attachFile('reconciled-project-no-automatch.zip')
+        cy.get('#import-project-button').click();
+
+        // before matching, ensure we have no matches, and candidates
+        cy.getCell(0, 'species').find('.data-table-recon-candidate').should('to.exist');
+        cy.getCell(1, 'species').find('.data-table-recon-candidate').should('to.exist');
+        cy.getCell(2, 'species').find('.data-table-recon-candidate').should('to.exist');
+        cy.getCell(3, 'species').find('.data-table-recon-candidate').should('to.exist');
+        cy.getCell(4, 'species').find('.data-table-recon-candidate').should('to.exist');
+        cy.getCell(5, 'species').find('.data-table-recon-candidate').should('to.exist');
+
+        // Match all
+        cy.columnActionClick('species', [
+            'Reconcile',
+            'Actions',
+            'Match each cell to its best candidate',
+        ]);
+
+        cy.assertNotificationContainingText(
+            'Match each of 6 cells to its best candidate'
+        );
+
+        // ensure all cells contains 'Choose new match'
+        // which means they are matched
+        cy.getCell(0, 'species').should('to.contain', 'Choose new match');
+        cy.getCell(1, 'species').should('to.contain', 'Choose new match');
+        cy.getCell(2, 'species').should('to.contain', 'Choose new match');
+        cy.getCell(3, 'species').should('to.contain', 'Choose new match');
+        cy.getCell(4, 'species').should('to.contain', 'Choose new match');
+        cy.getCell(5, 'species').should('to.contain', 'Choose new match');
+    });
+});
+
+
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/add_entity_identifiers.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/add_entity_identifiers.spec.js
new file mode 100644
index 000000000..ec012e306
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/add_entity_identifiers.spec.js
@@ -0,0 +1,32 @@
+describe('Add entity identifiers', () => {
+  it('Add a new column that contains the reconciliation id', () => {
+    cy.visitOpenRefine();
+    cy.navigateTo('Import project');
+    cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+
+    //we're using here the "automatched" project, so we can test that the facet contains choice for matched and non-matched judgments
+    cy.get('#project-tar-file-input').attachFile('reconciled-project-automatch.zip')
+    cy.get('#import-project-button').click();
+
+    cy.columnActionClick('species', [
+      'Reconcile',
+      'Add entity identifiers column',
+    ]);
+
+    // check the dialog, enter a new column name "id_column"
+    cy.get('.dialog-container .dialog-header').should(
+      'to.contain',
+      'Add column containing entity identifiers on species'
+    );
+    cy.get('.dialog-container .dialog-body input').type('id_column');
+    cy.get('.dialog-container .dialog-footer input').contains('OK').click();
+
+    // Check the cells content for the new column
+    cy.assertCellEquals(0, 'id_column', '2253634'); // untouched
+    cy.assertCellEquals(1, 'id_column', '2328088'); // blanked
+    cy.assertCellEquals(2, 'id_column', '2868241'); // untouched
+    cy.assertCellEquals(3, 'id_column', null); // untouched
+    cy.assertCellEquals(4, 'id_column', '8211794'); // blanked
+    cy.assertCellEquals(5, 'id_column', null); // blanked
+  });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/copy_reconciliation_data.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/copy_reconciliation_data.spec.js
new file mode 100644
index 000000000..75c6a3be7
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/copy_reconciliation_data.spec.js
@@ -0,0 +1,46 @@
+describe('Copy reconciliation data', () => {
+  it('Copy reconciliation data from species to species_copy', () => {
+    cy.visitOpenRefine();
+    cy.navigateTo('Import project');
+    cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+
+    //we're using here the "automatched" project, so we can test that the facet contains choice for matched and non-matched judgments
+    cy.get('#project-tar-file-input').attachFile('reconciled-project-automatch.zip')
+    cy.get('#import-project-button').click();
+
+
+    // Step 1, Duplicate the "species" column
+    cy.columnActionClick('species', [
+      'Edit column',
+      'Add column based on this column...',
+    ]);
+    cy.waitForDialogPanel();
+    cy.get('input[bind="columnNameInput"]').type('duplicated_column');
+    cy.confirmDialogPanel();
+
+    cy.columnActionClick('species', [
+      'Reconcile',
+      'Copy reconciliation data',
+    ]);
+
+    // check the dialog, enter a new column name "id_column"
+    cy.get('.dialog-container .dialog-header').should(
+      'to.contain',
+      'Copy recon judgments from column species'
+    );
+    cy.get('.dialog-container select[bind="toColumnSelect"]').select(
+      'duplicated_column'
+    );
+
+    cy.get('.dialog-container .dialog-footer button').contains('Copy').click();
+
+    cy.assertNotificationContainingText(
+      'Copy 4 recon judgments from column species to duplicated_column'
+    );
+
+    // ensure 4 are matched on the duplicate column
+    cy.get(
+      'table.data-table td .data-table-cell-content:contains("Choose new match")'
+    ).should('have.length', 4);
+  });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/facets/by_judgment.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/facets/by_judgment.spec.js
new file mode 100644
index 000000000..c65b9ffd2
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/facets/by_judgment.spec.js
@@ -0,0 +1,17 @@
+describe('Facet by judgment', () => {
+
+  it('Facets by judgment', () => {
+    cy.visitOpenRefine();
+    cy.navigateTo('Import project');
+    cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');
+
+    //we're using here the "automatched" project, so we can test that the facet contains choice for matched and non-matched judgments
+    cy.get('#project-tar-file-input').attachFile('reconciled-project-automatch.zip')
+    cy.get('#import-project-button').click();
+
+    cy.columnActionClick('species', ['Reconcile', 'Facets', 'By judgment']);
+
+    // ensure a new facet has been added
+    cy.getFacetContainer('species: judgment').should('exist').should('to.contain', 'matched').should('to.contain', 'none')
+  });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/use_values_as_identifiers.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/use_values_as_identifiers.spec.js
new file mode 100644
index 000000000..d8d4750c8
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/reconcile/use_values_as_identifiers.spec.js
@@ -0,0 +1,30 @@
+describe('Use values as identifiers', () => {
+  it('Test clearing reconciliation for a reconciled dataset', () => {
+    const fixture = [
+      ['identifier'],
+      ['2253634'],
+      ['2328088'],
+      ['2868241'],
+      [null],
+      ['8211794'],
+      [null],
+    ];
+
+    cy.loadAndVisitProject(fixture);
+
+    cy.columnActionClick('identifier', [
+      'Reconcile',
+      'Use values as identifiers',
+    ]);
+
+    cy.get('.dialog-container .dialog-footer button').contains('OK').click();
+
+    // ensure column is reconciled
+    cy.assertColumnIsReconciled('identifier');
+
+    // ensure 4 rows are matched based on the identifier
+    cy.get(
+      'table.data-table td .data-table-cell-content:contains("Choose new match")'
+    ).should('have.length', 4);
+  });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/view/expand-left.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/view/expand-left.spec.js
new file mode 100644
index 000000000..d1364055b
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/view/expand-left.spec.js
@@ -0,0 +1,26 @@
+// CS427 Issue Link: https://github.com/OpenRefine/OpenRefine/issues/4067
+describe(__filename, function () {
+const fixture = [
+        ['a', 'b', 'c'],
+
+        ['0a', '0b', '0c'],
+        ['1a', '1b', '1c']
+      ];
+  it('expands all columns to left', function () {
+    cy.loadAndVisitProject(fixture);
+    // Start by collapsing
+    cy.columnActionClick('c', ['View', 'Collapse all columns to left']);
+
+    // Verify collapsed columns
+    cy.get('[title="a"]').should('to.contain', '');
+    cy.get('[title="b"]').should('to.contain', '');
+
+    // Expand
+    cy.columnActionClick('c', ['View', 'Expand all columns to the left']);
+
+    // Verify expanded columns
+    cy.get('[title="a"]').should('to.contain', 'a');
+    cy.get('[title="b"]').should('to.contain', 'b');
+
+  });
+});
\ No newline at end of file
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/view/expand-right.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/view/expand-right.spec.js
new file mode 100644
index 000000000..43058a337
--- /dev/null
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/column/view/expand-right.spec.js
@@ -0,0 +1,26 @@
+// CS427 Issue Link: https://github.com/OpenRefine/OpenRefine/issues/4067
+describe(__filename, function () {
+const fixture = [
+        ['a', 'b', 'c'],
+
+        ['0a', '0b', '0c'],
+        ['1a', '1b', '1c']
+      ];
+  it('it collapses all columns to right', function () {
+    cy.loadAndVisitProject(fixture);
+    // Start by collapsing columns
+    cy.columnActionClick('a', ['View', 'Collapse all columns to right']);
+
+    // Verify collapse
+    cy.get('[title="b"]').should('to.contain', '');
+    cy.get('[title="c"]').should('to.contain', '');
+
+    // Expand columns
+    cy.columnActionClick('a', ['View', 'Expand all columns to the right']);
+
+    // Verify expansion
+    cy.get('[title="b"]').should('to.contain', 'b');
+    cy.get('[title="c"]').should('to.contain', 'c');
+
+  });
+});
diff --git a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/viewpanel-header/sort.spec.js b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/viewpanel-header/sort.spec.js
index a02cd2f0d..f759845dc 100644
--- a/OpenRefine/main/tests/cypress/cypress/integration/project/grid/viewpanel-header/sort.spec.js
+++ b/OpenRefine/main/tests/cypress/cypress/integration/project/grid/viewpanel-header/sort.spec.js
@@ -15,6 +15,7 @@ describe(__filename, function () {
     cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT');
     cy.get('.viewpanel-sorting a').contains('Sort').click();
     cy.get('.menu-container').contains('Reorder rows permanently').click();
+    cy.assertNotificationContainingText('Reorder rows');
     cy.reload();
     cy.getCell(0, 'Shrt_Desc').should('to.contain', 'BUTTER,WITH SALT');
     cy.getCell(1, 'Shrt_Desc').should('to.contain', 'BUTTER,WHIPPED,WITH SALT');
@@ -40,6 +41,7 @@ describe(__filename, function () {
     cy.getCell(1, 'NDB_No').should('to.contain', 1002);
     cy.get('.viewpanel-sorting a').contains('Sort').click();
     cy.get('.menu-container').contains('Reorder rows permanently').click();
+    cy.assertNotificationContainingText('Reorder rows');
     cy.reload();
     cy.getCell(0, 'NDB_No').should('to.contain', 1001);
     cy.getCell(1, 'NDB_No').should('to.contain', 1002);
@@ -66,6 +68,7 @@ describe(__filename, function () {
 
     cy.get('.viewpanel-sorting a').contains('Sort').click();
     cy.get('.menu-container').contains('Reorder rows permanently').click();
+    cy.assertNotificationContainingText('Reorder rows');
     cy.reload();
     cy.getCell(0, 'Date').should('to.contain', '2020-08-17T00:00:00Z');
     cy.getCell(1, 'Date').should('to.contain', '2020-12-17T00:00:00Z');
@@ -104,6 +107,7 @@ describe(__filename, function () {
     cy.getCell(1, 'Fat').should('to.contain', 'false');
     cy.get('.viewpanel-sorting a').contains('Sort').click();
     cy.get('.menu-container').contains('Reorder rows permanently').click();
+    cy.assertNotificationContainingText('Reorder rows');
     cy.reload();
     cy.getCell(0, 'Fat').should('to.contain', 'true');
     cy.getCell(1, 'Fat').should('to.contain', 'false');
diff --git a/OpenRefine/main/tests/cypress/cypress/support/commands.js b/OpenRefine/main/tests/cypress/cypress/support/commands.js
index b7cdc6b3e..87f02f461 100644
--- a/OpenRefine/main/tests/cypress/cypress/support/commands.js
+++ b/OpenRefine/main/tests/cypress/cypress/support/commands.js
@@ -15,75 +15,75 @@ import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command';
 
 addMatchImageSnapshotCommand({ customDiffDir: 'cypress/snapshots_diffs' });
 
-/**
- * Reconcile a column
- * Internally using the "apply" behavior for not having to go through the whole user interface
- */
-Cypress.Commands.add('reconcileColumn', (columnName, autoMatch = true) => {
-  cy.setPreference(
-    'reconciliation.standardServices',
-    encodeURIComponent(
-      JSON.stringify([
-        {
-          name: 'CSV Reconciliation service',
-          identifierSpace: 'http://localhost:8000/',
-          schemaSpace: 'http://localhost:8000/',
-          defaultTypes: [],
-          view: { url: 'http://localhost:8000/view/{{id}}' },
-          preview: {
-            width: 500,
-            url: 'http://localhost:8000/view/{{id}}',
-            height: 350,
-          },
-          suggest: {
-            entity: {
-              service_url: 'http://localhost:8000',
-              service_path: '/suggest',
-              flyout_service_url: 'http://localhost:8000',
-              flyout_sercice_path: '/flyout',
-            },
-          },
-          url: 'http://localhost:8000/reconcile',
-          ui: { handler: 'ReconStandardServicePanel', access: 'jsonp' },
-        },
-      ])
-    )
-  ).then(() => {
-    const apply = [
-      {
-        op: 'core/recon',
-        engineConfig: {
-          facets: [],
-          mode: 'row-based',
-        },
-        columnName: columnName,
-        config: {
-          mode: 'standard-service',
-          service: 'http://localhost:8000/reconcile',
-          identifierSpace: 'http://localhost:8000/',
-          schemaSpace: 'http://localhost:8000/',
-          type: {
-            id: '/csv-recon',
-            name: 'CSV-recon',
-          },
-          autoMatch: autoMatch,
-          columnDetails: [],
-          limit: 0,
-        },
-        description: 'Reconcile cells in column species to type /csv-recon',
-      },
-    ];
-    cy.get('a#or-proj-undoRedo').click();
-    cy.get('#refine-tabs-history .history-panel-controls')
-      .contains('Apply')
-      .click();
-    cy.get('.dialog-container .history-operation-json').invoke(
-      'val',
-      JSON.stringify(apply)
-    );
-    cy.get('.dialog-container button[bind="applyButton"]').click();
-  });
-});
+// /**
+//  * Reconcile a column
+//  * Internally using the "apply" behavior for not having to go through the whole user interface
+//  */
+// Cypress.Commands.add('reconcileColumn', (columnName, autoMatch = true) => {
+//   cy.setPreference(
+//     'reconciliation.standardServices',
+//     encodeURIComponent(
+//       JSON.stringify([
+//         {
+//           name: 'CSV Reconciliation service',
+//           identifierSpace: 'http://localhost:8000/',
+//           schemaSpace: 'http://localhost:8000/',
+//           defaultTypes: [],
+//           view: { url: 'http://localhost:8000/view/{{id}}' },
+//           preview: {
+//             width: 500,
+//             url: 'http://localhost:8000/view/{{id}}',
+//             height: 350,
+//           },
+//           suggest: {
+//             entity: {
+//               service_url: 'http://localhost:8000',
+//               service_path: '/suggest',
+//               flyout_service_url: 'http://localhost:8000',
+//               flyout_sercice_path: '/flyout',
+//             },
+//           },
+//           url: 'http://localhost:8000/reconcile',
+//           ui: { handler: 'ReconStandardServicePanel', access: 'jsonp' },
+//         },
+//       ])
+//     )
+//   ).then(() => {
+//     const apply = [
+//       {
+//         op: 'core/recon',
+//         engineConfig: {
+//           facets: [],
+//           mode: 'row-based',
+//         },
+//         columnName: columnName,
+//         config: {
+//           mode: 'standard-service',
+//           service: 'http://localhost:8000/reconcile',
+//           identifierSpace: 'http://localhost:8000/',
+//           schemaSpace: 'http://localhost:8000/',
+//           type: {
+//             id: '/csv-recon',
+//             name: 'CSV-recon',
+//           },
+//           autoMatch: autoMatch,
+//           columnDetails: [],
+//           limit: 0,
+//         },
+//         description: 'Reconcile cells in column species to type /csv-recon',
+//       },
+//     ];
+//     cy.get('a#or-proj-undoRedo').click();
+//     cy.get('#refine-tabs-history .history-panel-controls')
+//       .contains('Apply')
+//       .click();
+//     cy.get('.dialog-container .history-operation-json').invoke(
+//       'val',
+//       JSON.stringify(apply)
+//     );
+//     cy.get('.dialog-container button[bind="applyButton"]').click();
+//   });
+// });
 
 /**
  * Reconcile a column
@@ -319,12 +319,12 @@ Cypress.Commands.add('confirmDialogPanel', () => {
 /**
  * Click on the Cancel button of a dialog panel
  */
- Cypress.Commands.add('cancelDialogPanel', () => {
-   cy.get(
-     'body > .dialog-container > .dialog-frame .dialog-footer button[bind="cancelButton"]'
-   ).click();
-   cy.get('body > .dialog-container > .dialog-frame').should('not.exist');
- });
+Cypress.Commands.add('cancelDialogPanel', () => {
+  cy.get(
+    'body > .dialog-container > .dialog-frame .dialog-footer button[bind="cancelButton"]'
+  ).click();
+  cy.get('body > .dialog-container > .dialog-frame').should('not.exist');
+});
 
 /**
  * Will click on a menu entry for a given column name
diff --git a/OpenRefine/main/tests/cypress/cypress/support/openrefine_api.js b/OpenRefine/main/tests/cypress/cypress/support/openrefine_api.js
index bb1ce46e2..a4a585727 100644
--- a/OpenRefine/main/tests/cypress/cypress/support/openrefine_api.js
+++ b/OpenRefine/main/tests/cypress/cypress/support/openrefine_api.js
@@ -18,14 +18,97 @@ Cypress.Commands.add('setPreference', (preferenceName, preferenceValue) => {
         .then((resp) => {
           cy.log(
             'Set preference ' +
-              preferenceName +
-              ' with value ' +
-              preferenceValue
+            preferenceName +
+            ' with value ' +
+            preferenceValue
           );
         });
     });
 });
 
+
+Cypress.Commands.add('importProject', (projectTarFile, projectName) => {
+  const openRefineUrl = Cypress.env('OPENREFINE_URL');
+
+
+  cy.get('@token', { log: false }).then((token) => {
+    // cy.request(Cypress.env('OPENREFINE_URL')+'/command/core/get-csrf-token').then((response) => {
+    const openRefineFormat = 'text/line-based/*sv';
+
+    // the following code can be used to inject tags in created projects
+    // It's conflicting though, breaking up the CSV files
+    // It is a hack to parse out CSV files in the openrefine while creating a project with tags
+    const options = {
+      encoding: 'US-ASCII',
+      separator: ',',
+      ignoreLines: -1,
+      headerLines: 1,
+      skipDataLines: 0,
+      limit: -1,
+      storeBlankRows: true,
+      guessCellValueTypes: false,
+      processQuotes: true,
+      quoteCharacter: '"',
+      storeBlankCellsAsNulls: true,
+      includeFileSources: false,
+      includeArchiveFileName: false,
+      trimStrings: false,
+      projectName: openRefineProjectName,
+      projectTags: [tagName],
+    };
+    let postData;
+    if (tagName == undefined) {
+      postData =
+        '------BOUNDARY\r\nContent-Disposition: form-data; name="project-file"; filename="test.csv"' +
+        '\r\nContent-Type: "text/csv"\r\n\r\n' +
+        content +
+        '\r\n------BOUNDARY\r\nContent-Disposition: form-data; name="project-name"\r\n\r\n' +
+        openRefineProjectName +
+        '\r\n------BOUNDARY\r\nContent-Disposition: form-data; name="format"\r\n\r\n' +
+        openRefineFormat +
+        '\r\n------BOUNDARY--';
+    } else {
+      postData =
+        '------BOUNDARY\r\nContent-Disposition: form-data; name="project-file"; filename="test.csv"' +
+        '\r\nContent-Type: "text/csv"\r\n\r\n' +
+        content +
+        '\r\n------BOUNDARY\r\nContent-Disposition: form-data; name="project-name"\r\n\r\n' +
+        openRefineProjectName +
+        '\r\n------BOUNDARY\r\nContent-Disposition: form-data; name="options"\r\n\r\n' +
+        JSON.stringify(options) +
+        '\r\n------BOUNDARY\r\nContent-Disposition: form-data; name="format"\r\n\r\n' +
+        openRefineFormat +
+        '\r\n------BOUNDARY--';
+    }
+
+    cy.request({
+      method: 'POST',
+      url:
+        `${openRefineUrl}/command/core/create-project-from-upload?csrf_token=` +
+        token,
+      body: postData,
+      headers: {
+        'content-type': 'multipart/form-data; boundary=----BOUNDARY',
+      },
+    }).then((resp) => {
+      const location = resp.allRequestResponses[0]['Response Headers'].location;
+      const projectId = location.split('=').slice(-1)[0];
+      cy.log('Created OR project', projectId);
+
+      cy.get('@loadedProjectIds', { log: false }).then((loadedProjectIds) => {
+        loadedProjectIds.push(projectId);
+        cy.wrap(loadedProjectIds, { log: false })
+          .as('loadedProjectIds')
+          .then(() => {
+            return projectId;
+          });
+      });
+    });
+  });
+
+
+})
+
 Cypress.Commands.add('cleanupProjects', () => {
   const openRefineUrl = Cypress.env('OPENREFINE_URL');
   cy.get('@deletetoken', { log: false }).then((token) => {
diff --git a/OpenRefine/main/tests/cypress/package.json b/OpenRefine/main/tests/cypress/package.json
index dd1025dd0..d713df8e6 100644
--- a/OpenRefine/main/tests/cypress/package.json
+++ b/OpenRefine/main/tests/cypress/package.json
@@ -11,16 +11,16 @@
         "lint": "prettier --check . && eslint ."
     },
     "dependencies": {
-        "cypress": "9.1.0",
+        "cypress": "9.3.1",
         "cypress-image-snapshot": "^4.0.1",
         "cypress-file-upload": "^5.0.8",
         "cypress-wait-until": "^1.7.2",
-        "dotenv": "^10.0.0",
+        "dotenv": "^14.3.2",
         "fs-extra": "^10.0.0",
         "uniqid": "^5.4.0"
     },
     "devDependencies": {
-        "eslint": "^8.4.1",
+        "eslint": "^8.7.0",
         "eslint-config-google": "^0.14.0",
         "eslint-config-prettier": "^8.2.0",
         "eslint-plugin-cypress": "^2.12.1",
diff --git a/OpenRefine/main/tests/cypress/yarn.lock b/OpenRefine/main/tests/cypress/yarn.lock
index 2d7f00add..189755b3f 100644
--- a/OpenRefine/main/tests/cypress/yarn.lock
+++ b/OpenRefine/main/tests/cypress/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.13.tgz#3ee7be4131fe657ba9143d5c5b3a9f253fdb75e9"
   integrity sha512-z7n7ybOUzaRc3wwqLpAX8UFIXsrVXUJhtNGBwAnLz6d1KUapqyq7ad2La8gZ6CXhHmGAIL32cop8Tst4/PNWLw==
 
-"@cypress/request@^2.88.7":
-  version "2.88.9"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.9.tgz#7428fc66008ec3a4727c189857f6bb7f758f1d92"
-  integrity sha512-6md3dtAd3DXfTEXFb2Yde3TSaqpYsSBw3a1VFwAC9Fscu2B0DtY2Venu35csZyJj09XNkPMGRoE4ZXUdtkI+zg==
+"@cypress/request@^2.88.10":
+  version "2.88.10"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
+  integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -19,7 +19,6 @@
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.3"
     http-signature "~1.3.6"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -84,10 +83,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
   integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
 
-"@types/sinonjs__fake-timers@^6.0.2":
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz#3a84cf5ec3249439015e14049bd3161419bf9eae"
-  integrity sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==
+"@types/sinonjs__fake-timers@8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
   version "2.3.2"
@@ -106,10 +105,10 @@ acorn-jsx@^5.3.1:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
-  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
+acorn@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
 aggregate-error@^3.0.0:
   version "3.1.0"
@@ -119,7 +118,7 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4:
+ajv@^6.10.0, ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -256,7 +255,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-js@^1.2.3:
+base64-js@^1.2.3, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -273,7 +272,7 @@ blob-util@^2.0.2:
   resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
   integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
 
-bluebird@3.7.2, bluebird@^3.7.2:
+bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -291,6 +290,14 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
+buffer@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 cachedir@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz"
@@ -363,15 +370,14 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-table3@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.0.tgz"
-  integrity sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==
+cli-table3@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
+  integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
   dependencies:
-    object-assign "^4.1.0"
     string-width "^4.2.0"
   optionalDependencies:
-    colors "^1.1.2"
+    colors "1.4.0"
 
 cli-truncate@^2.1.0:
   version "2.1.0"
@@ -410,9 +416,9 @@ colorette@^1.2.2:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
-colors@^1.1.2:
+colors@1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
@@ -484,24 +490,25 @@ cypress-wait-until@^1.7.2:
   resolved "https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz#7f534dd5a11c89b65359e7a0210f20d3dfc22107"
   integrity sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==
 
-cypress@9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.1.0.tgz#5d23c1b363b7d4853009c74a422a083a8ad2601c"
-  integrity sha512-fyXcCN51vixkPrz/vO/Qy6WL3hKYJzCQFeWofOpGOFewVVXrGfmfSOGFntXpzWBXsIwPn3wzW0HOFw51jZajNQ==
+cypress@9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.3.1.tgz#8116f52d49d6daf90a91e88f3eafd940234d2958"
+  integrity sha512-BODdPesxX6bkVUnH8BVsV8I/jn57zQtO1FEOUTiuG2us3kslW7g0tcuwiny7CKCmJUZz8S/D587ppC+s58a+5Q==
   dependencies:
-    "@cypress/request" "^2.88.7"
+    "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
     "@types/node" "^14.14.31"
-    "@types/sinonjs__fake-timers" "^6.0.2"
+    "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
     blob-util "^2.0.2"
-    bluebird "3.7.2"
+    bluebird "^3.7.2"
+    buffer "^5.6.0"
     cachedir "^2.3.0"
     chalk "^4.1.0"
     check-more-types "^2.24.0"
     cli-cursor "^3.1.0"
-    cli-table3 "~0.6.0"
+    cli-table3 "~0.6.1"
     commander "^5.1.0"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
@@ -574,10 +581,10 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dotenv@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
-  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+dotenv@^14.3.2:
+  version "14.3.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-14.3.2.tgz#7c30b3a5f777c79a3429cb2db358eef6751e8369"
+  integrity sha512-vwEppIphpFdvaMCaHfCEv9IgwcxMljMw2TnAQBB4VWPvzXQLTb82jwmdOKzlEVUL3gNFT4l4TPKO+Bn+sqcrVQ==
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
@@ -599,7 +606,7 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enquirer@^2.3.5, enquirer@^2.3.6:
+enquirer@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@@ -663,15 +670,15 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint-visitor-keys@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
-  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
+eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
+  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
 
-eslint@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.4.1.tgz#d6531bbf3e598dffd7c0c7d35ec52a0b30fdfa2d"
-  integrity sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg==
+eslint@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.7.0.tgz#22e036842ee5b7cf87b03fe237731675b4d3633c"
+  integrity sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==
   dependencies:
     "@eslint/eslintrc" "^1.0.5"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -680,12 +687,11 @@ eslint@^8.4.1:
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
     eslint-scope "^7.1.0"
     eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.1.0"
-    espree "^9.2.0"
+    eslint-visitor-keys "^3.2.0"
+    espree "^9.3.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -693,7 +699,7 @@ eslint@^8.4.1:
     functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
     globals "^13.6.0"
-    ignore "^4.0.6"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
@@ -704,20 +710,18 @@ eslint@^8.4.1:
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
     regexpp "^3.2.0"
-    semver "^7.2.1"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-espree@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
-  integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
+espree@^9.2.0, espree@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"
+  integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==
   dependencies:
-    acorn "^8.6.0"
+    acorn "^8.7.0"
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^3.1.0"
 
@@ -1000,19 +1004,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"
@@ -1044,11 +1035,21 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
+ieee754@^1.1.13:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"
@@ -1335,13 +1336,6 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
 markdown-it-anchor@^5.2.7:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz#d549acd64856a8ecd1bea58365ef385effbac744"
@@ -1443,11 +1437,6 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"
@@ -1600,11 +1589,6 @@ pretty-bytes@^5.6.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-progress@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
-
 proxy-from-env@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -1711,13 +1695,6 @@ semver@^5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^7.2.1:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -2071,11 +2048,6 @@ xmldom@0.1.x:
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
   integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
 
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java b/OpenRefine/main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java
index 65bb5acc0..5e984a8a9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/HistoryEntryManagerStub.java
@@ -42,8 +42,7 @@ import com.google.refine.history.HistoryEntry;
 import com.google.refine.history.HistoryEntryManager;
 import com.google.refine.io.FileProjectManager;
 
-
-public class HistoryEntryManagerStub implements HistoryEntryManager{
+public class HistoryEntryManagerStub implements HistoryEntryManager {
 
     @Override
     public void delete(HistoryEntry historyEntry) {
@@ -72,11 +71,11 @@ public class HistoryEntryManagerStub implements HistoryEntryManager{
     }
 
     protected File getHistoryDir(HistoryEntry historyEntry) {
-        File dir = new File(((FileProjectManager)ProjectManager.singleton)
+        File dir = new File(((FileProjectManager) ProjectManager.singleton)
                 .getProjectDir(historyEntry.projectID),
                 "history");
         dir.mkdirs();
 
         return dir;
     }
-}
\ No newline at end of file
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerStub.java b/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerStub.java
index 4671c86bc..68d3f41bf 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerStub.java
@@ -93,9 +93,9 @@ public class ProjectManagerStub extends ProjectManager {
         // empty
     }
 
-    //Overridden to make public for testing
+    // Overridden to make public for testing
     @Override
-    public void saveProjects(boolean allModified){
+    public void saveProjects(boolean allModified) {
         super.saveProjects(allModified);
     }
 
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerTests.java b/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerTests.java
index a5d539646..1e5cf8cd8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/ProjectManagerTests.java
@@ -57,6 +57,7 @@ import com.google.refine.model.ProjectStub;
 import com.google.refine.process.ProcessManager;
 
 public class ProjectManagerTests extends RefineTest {
+
     ProjectManagerStub pm;
     ProjectManagerStub SUT;
     Project project;
@@ -70,7 +71,7 @@ public class ProjectManagerTests extends RefineTest {
     }
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         pm = new ProjectManagerStub();
         SUT = spy(pm);
         project = mock(Project.class);
@@ -81,7 +82,7 @@ public class ProjectManagerTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         metadata = null;
         project = null;
         SUT = null;
@@ -89,28 +90,28 @@ public class ProjectManagerTests extends RefineTest {
     }
 
     @Test
-    public void canRegisterProject(){
+    public void canRegisterProject() {
 
         SUT.registerProject(project, metadata);
 
-        AssertProjectRegistered();      
+        AssertProjectRegistered();
         verify(metadata, times(1)).getTags();
-        
+
         verifyNoMoreInteractions(project);
         verifyNoMoreInteractions(metadata);
     }
 
-    //TODO test registerProject in race condition
+    // TODO test registerProject in race condition
 
     @Test
-    public void canEnsureProjectSave(){
+    public void canEnsureProjectSave() {
         whenGetSaveTimes(project, metadata);
         registerProject();
 
-        //run test
+        // run test
         SUT.ensureProjectSaved(project.id);
 
-        //assert and verify
+        // assert and verify
         AssertProjectRegistered();
         try {
             verify(SUT, times(1)).saveMetadata(metadata, project.id);
@@ -120,26 +121,26 @@ public class ProjectManagerTests extends RefineTest {
         this.verifySaveTimeCompared(1);
         verify(SUT, times(1)).saveProject(project);
         verify(metadata, times(1)).getTags();
-        
-        //ensure end
+
+        // ensure end
         verifyNoMoreInteractions(project);
         verifyNoMoreInteractions(metadata);
     }
 
-    //TODO test ensureProjectSave in race condition
+    // TODO test ensureProjectSave in race condition
 
     @Test
-    public void canSaveAllModified(){
-        whenGetSaveTimes(project, metadata); //5 minute difference
+    public void canSaveAllModified() {
+        whenGetSaveTimes(project, metadata); // 5 minute difference
         registerProject(project, metadata);
 
-        //add a second project to the cache
+        // add a second project to the cache
         Project project2 = spy(new ProjectStub(2));
         ProjectMetadata metadata2 = mock(ProjectMetadata.class);
-        whenGetSaveTimes(project2, metadata2, 10); //not modified since the last save but within 30 seconds flush limit
+        whenGetSaveTimes(project2, metadata2, 10); // not modified since the last save but within 30 seconds flush limit
         registerProject(project2, metadata2);
 
-        //check that the two projects are not the same
+        // check that the two projects are not the same
         Assert.assertFalse(project.id == project2.id);
 
         SUT.save(true);
@@ -152,9 +153,9 @@ public class ProjectManagerTests extends RefineTest {
     }
 
     @Test
-    public void canFlushFromCache(){
+    public void canFlushFromCache() {
 
-        whenGetSaveTimes(project, metadata, -10 );//already saved (10 seconds before)
+        whenGetSaveTimes(project, metadata, -10);// already saved (10 seconds before)
         registerProject(project, metadata);
         Assert.assertSame(SUT.getProject(0), project);
 
@@ -174,7 +175,7 @@ public class ProjectManagerTests extends RefineTest {
     }
 
     @Test
-    public void cannotSaveWhenBusy(){
+    public void cannotSaveWhenBusy() {
         registerProject();
         SUT.setBusy(true);
 
@@ -187,65 +188,69 @@ public class ProjectManagerTests extends RefineTest {
         verifyNoMoreInteractions(metadata);
     }
 
-    //TODO test canSaveAllModifiedWithRaceCondition
+    // TODO test canSaveAllModifiedWithRaceCondition
 
     @Test
-    public void canSaveSomeModified(){
+    public void canSaveSomeModified() {
         registerProject();
-        whenGetSaveTimes(project, metadata );
+        whenGetSaveTimes(project, metadata);
 
-        SUT.save(false); //not busy
+        SUT.save(false); // not busy
 
         verifySaved(project, metadata);
         verify(SUT, times(1)).saveWorkspace();
 
     }
-    //TODO test canSaveAllModifiedWithRaceCondition
+    // TODO test canSaveAllModifiedWithRaceCondition
 
-    //-------------helpers-------------
+    // -------------helpers-------------
 
-    protected void registerProject(){
+    protected void registerProject() {
         this.registerProject(project, metadata);
     }
-    protected void registerProject(Project proj, ProjectMetadata meta){
+
+    protected void registerProject(Project proj, ProjectMetadata meta) {
         SUT.registerProject(proj, meta);
     }
 
-    protected void AssertProjectRegistered(){
+    protected void AssertProjectRegistered() {
         Assert.assertEquals(SUT.getProject(project.id), project);
         Assert.assertEquals(SUT.getProjectMetadata(project.id), metadata);
     }
 
-    protected void whenGetSaveTimes(Project proj, ProjectMetadata meta){
+    protected void whenGetSaveTimes(Project proj, ProjectMetadata meta) {
         whenGetSaveTimes(proj, meta, 5);
     }
-    protected void whenGetSaveTimes(Project proj, ProjectMetadata meta, int secondsDifference){
+
+    protected void whenGetSaveTimes(Project proj, ProjectMetadata meta, int secondsDifference) {
         whenProjectGetLastSave(proj);
         whenMetadataGetModified(meta, secondsDifference);
     }
 
-    protected void whenProjectGetLastSave(Project proj){
-        LocalDateTime projectLastSaveDate = LocalDateTime.of(1970,01,02,00,30,00);
+    protected void whenProjectGetLastSave(Project proj) {
+        LocalDateTime projectLastSaveDate = LocalDateTime.of(1970, 01, 02, 00, 30, 00);
         when(proj.getLastSave()).thenReturn(projectLastSaveDate);
     }
 
-    protected void whenMetadataGetModified(ProjectMetadata meta){
-        whenMetadataGetModified(meta, 5*60);
+    protected void whenMetadataGetModified(ProjectMetadata meta) {
+        whenMetadataGetModified(meta, 5 * 60);
     }
-    protected void whenMetadataGetModified(ProjectMetadata meta, int secondsDifference){
-        LocalDateTime metadataModifiedDate = LocalDateTime.of(1970,01,02,00, 30 + secondsDifference);
+
+    protected void whenMetadataGetModified(ProjectMetadata meta, int secondsDifference) {
+        LocalDateTime metadataModifiedDate = LocalDateTime.of(1970, 01, 02, 00, 30 + secondsDifference);
         when(meta.getModified()).thenReturn(metadataModifiedDate);
     }
 
-    protected void verifySaveTimeCompared(int times){
+    protected void verifySaveTimeCompared(int times) {
         verifySaveTimeCompared(project, metadata, times);
     }
-    protected void verifySaveTimeCompared(Project project, ProjectMetadata metadata, int times){
+
+    protected void verifySaveTimeCompared(Project project, ProjectMetadata metadata, int times) {
         verify(metadata, times(times)).getModified();
         verify(project, times(times)).getLastSave();
     }
 
-    protected void verifySaved(Project proj, ProjectMetadata meta){
+    protected void verifySaved(Project proj, ProjectMetadata meta) {
         verify(meta, times(1)).getModified();
         verify(proj, times(2)).getLastSave();
         verify(SUT, times(1)).saveProject(proj);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/RefineServletStub.java b/OpenRefine/main/tests/server/src/com/google/refine/RefineServletStub.java
index 788006a99..cb4fa61a2 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/RefineServletStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/RefineServletStub.java
@@ -52,18 +52,18 @@ import com.google.refine.commands.Command;
 public class RefineServletStub extends RefineServlet {
 
     private static File tempDir = null;
-    
-    //requirement of extending HttpServlet, not required for testing
+
+    // requirement of extending HttpServlet, not required for testing
     private static final long serialVersionUID = 1L;
 
-    public void wrapService(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException{
+    public void wrapService(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.service(request, response);
     }
 
-    public String wrapGetCommandName(HttpServletRequest request){
+    public String wrapGetCommandName(HttpServletRequest request) {
         return super.getCommandKey(request);
     }
-    
+
     @Override
     public File getTempDir() {
         if (tempDir == null) {
@@ -72,27 +72,29 @@ public class RefineServletStub extends RefineServlet {
                 tempDir = tempDirPath.toFile();
                 tempDir.deleteOnExit();
             } catch (IOException e) {
-                throw new RuntimeException("Failed to create temp directory",e);
+                throw new RuntimeException("Failed to create temp directory", e);
             }
         }
-        return tempDir; 
+        return tempDir;
     }
 
-    //-------------------helper methods--------------
+    // -------------------helper methods--------------
     /**
      * Helper method for inserting a mock object
+     * 
      * @param commandName
      * @param command
      */
-    public void insertCommand(String commandName, Command command ){
+    public void insertCommand(String commandName, Command command) {
         registerOneCommand("core/" + commandName, command);
     }
 
     /**
      * Helper method for clearing up after testing
+     * 
      * @param commandName
      */
-    public void removeCommand( String commandName ){
+    public void removeCommand(String commandName) {
         unregisterCommand("core/" + commandName);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/RefineServletTests.java b/OpenRefine/main/tests/server/src/com/google/refine/RefineServletTests.java
index c0c158165..cadece944 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/RefineServletTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/RefineServletTests.java
@@ -55,17 +55,17 @@ import org.testng.annotations.Test;
 import com.google.refine.commands.Command;
 
 public class RefineServletTests extends RefineTest {
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-        
-    //System under test
+
+    // System under test
     RefineServletStub SUT = null;
 
-    //variables
+    // variables
     final static private String TEST_COMMAND_NAME = "test-command";
     final static private String TEST_COMMAND_PATH = "/command/core/test-command/foobar";
     final static private String BAD_COMMAND_PATH = "/command/core/command-does-not-exist";
@@ -74,13 +74,12 @@ public class RefineServletTests extends RefineTest {
     final static private String GET = "GET";
     final static private String PUT = "PUT";
     final static private String DELETE = "DELETE";
-    
+
     // mocks
     HttpServletRequest request = null;
     HttpServletResponse response = null;
     Command command = null;
 
-
     @BeforeMethod
     public void SetUp() throws ServletException {
         request = mock(HttpServletRequest.class);
@@ -88,29 +87,29 @@ public class RefineServletTests extends RefineTest {
         command = mock(Command.class);
 
         SUT = new RefineServletStub();
-        SUT.insertCommand(TEST_COMMAND_NAME,command); //inject mock into command container
+        SUT.insertCommand(TEST_COMMAND_NAME, command); // inject mock into command container
     }
 
     @AfterMethod
     public void TearDown() {
-        SUT.removeCommand(TEST_COMMAND_NAME); //remove mock to clean command container
+        SUT.removeCommand(TEST_COMMAND_NAME); // remove mock to clean command container
         SUT = null;
-        
+
         request = null;
         response = null;
         command = null;
     }
-    
-    //-------------------AutoSaveTimerTask tests-----------
-    //TODO would need to mock Timer and inject it into RefineServlet.  Also need to deal with ProjectManager.singleton
-    //-------------------init tests------------------------
-    //TODO need to stub super.init(), mock Timer and inject it into RefineServlet
-    //-------------------destroy tests---------------------
-    //TODO need to mock Timer and inject it into RefineServlet.  Also need to deal with ProjectManager.singleton
 
-    //--------------------doGet tests----------------------
+    // -------------------AutoSaveTimerTask tests-----------
+    // TODO would need to mock Timer and inject it into RefineServlet. Also need to deal with ProjectManager.singleton
+    // -------------------init tests------------------------
+    // TODO need to stub super.init(), mock Timer and inject it into RefineServlet
+    // -------------------destroy tests---------------------
+    // TODO need to mock Timer and inject it into RefineServlet. Also need to deal with ProjectManager.singleton
+
+    // --------------------doGet tests----------------------
     @Test
-    public void doGetRegressionTest(){
+    public void doGetRegressionTest() {
         whenGetCommandNameThenReturn(TEST_COMMAND_PATH);
         whenGetMethodThenReturn(GET);
 
@@ -124,7 +123,7 @@ public class RefineServletTests extends RefineTest {
 
         verifyGetCommandNameCalled(2);
         try {
-            verify(command,times(1)).doGet(request, response);
+            verify(command, times(1)).doGet(request, response);
         } catch (ServletException e) {
             Assert.fail();
         } catch (IOException e) {
@@ -133,7 +132,7 @@ public class RefineServletTests extends RefineTest {
     }
 
     @Test
-    public void doGetReturnsError404WhenCommandNotFound(){
+    public void doGetReturnsError404WhenCommandNotFound() {
         whenGetCommandNameThenReturn(BAD_COMMAND_PATH);
         whenGetMethodThenReturn(GET);
 
@@ -150,9 +149,9 @@ public class RefineServletTests extends RefineTest {
 
     }
 
-    //----------------doPost tests-------------------------
+    // ----------------doPost tests-------------------------
     @Test
-    public void doPostRegressionTest(){
+    public void doPostRegressionTest() {
         whenGetCommandNameThenReturn(TEST_COMMAND_PATH);
         whenGetMethodThenReturn(POST);
 
@@ -166,7 +165,7 @@ public class RefineServletTests extends RefineTest {
 
         verifyGetCommandNameCalled(2);
         try {
-            verify(command,times(1)).doPost(request, response);
+            verify(command, times(1)).doPost(request, response);
         } catch (ServletException e) {
             Assert.fail();
         } catch (IOException e) {
@@ -175,10 +174,10 @@ public class RefineServletTests extends RefineTest {
     }
 
     @Test
-    public void doPostReturns404WhenCommandNotFound(){
+    public void doPostReturns404WhenCommandNotFound() {
         whenGetCommandNameThenReturn(BAD_COMMAND_PATH);
         whenGetMethodThenReturn(POST);
-        
+
         try {
             SUT.wrapService(request, response);
         } catch (ServletException e) {
@@ -191,9 +190,9 @@ public class RefineServletTests extends RefineTest {
         verifyError404Called();
     }
 
-    //----------------doPut tests-------------------------
+    // ----------------doPut tests-------------------------
     @Test
-    public void doPutRegressionTest(){
+    public void doPutRegressionTest() {
         whenGetCommandNameThenReturn(TEST_COMMAND_PATH);
         whenGetMethodThenReturn(PUT);
 
@@ -207,7 +206,7 @@ public class RefineServletTests extends RefineTest {
 
         verifyGetCommandNameCalled(2);
         try {
-            verify(command,times(1)).doPut(request, response);
+            verify(command, times(1)).doPut(request, response);
         } catch (ServletException e) {
             Assert.fail();
         } catch (IOException e) {
@@ -216,10 +215,10 @@ public class RefineServletTests extends RefineTest {
     }
 
     @Test
-    public void doPutReturns404WhenCommandNotFound(){
+    public void doPutReturns404WhenCommandNotFound() {
         whenGetCommandNameThenReturn(BAD_COMMAND_PATH);
         whenGetMethodThenReturn(PUT);
-        
+
         try {
             SUT.wrapService(request, response);
         } catch (ServletException e) {
@@ -232,9 +231,9 @@ public class RefineServletTests extends RefineTest {
         verifyError404Called();
     }
 
-    //----------------doDelete tests-------------------------
+    // ----------------doDelete tests-------------------------
     @Test
-    public void doDeleteRegressionTest(){
+    public void doDeleteRegressionTest() {
         whenGetCommandNameThenReturn(TEST_COMMAND_PATH);
         whenGetMethodThenReturn(DELETE);
 
@@ -248,7 +247,7 @@ public class RefineServletTests extends RefineTest {
 
         verifyGetCommandNameCalled(2);
         try {
-            verify(command,times(1)).doDelete(request, response);
+            verify(command, times(1)).doDelete(request, response);
         } catch (ServletException e) {
             Assert.fail();
         } catch (IOException e) {
@@ -257,10 +256,10 @@ public class RefineServletTests extends RefineTest {
     }
 
     @Test
-    public void doDeleteReturns404WhenCommandNotFound(){
+    public void doDeleteReturns404WhenCommandNotFound() {
         whenGetCommandNameThenReturn(BAD_COMMAND_PATH);
         whenGetMethodThenReturn(DELETE);
-        
+
         try {
             SUT.wrapService(request, response);
         } catch (ServletException e) {
@@ -273,10 +272,10 @@ public class RefineServletTests extends RefineTest {
         verifyError404Called();
     }
 
-    //----------------getCommandName tests----------------
+    // ----------------getCommandName tests----------------
 
     @Test
-    public void getCommandNameHandlesBadCommandName(){
+    public void getCommandNameHandlesBadCommandName() {
 
         when(request.getPathInfo()).thenReturn("/command/this-command-has-no-trailing-slash");
 
@@ -285,19 +284,22 @@ public class RefineServletTests extends RefineTest {
         verify(request, times(1)).getPathInfo();
     }
 
-    //------------helpers
-    protected void whenGetCommandNameThenReturn(String commandName){
+    // ------------helpers
+    protected void whenGetCommandNameThenReturn(String commandName) {
         when(request.getPathInfo()).thenReturn(commandName);
     }
-    protected void whenGetMethodThenReturn(String method){
+
+    protected void whenGetMethodThenReturn(String method) {
         when(request.getMethod()).thenReturn(method);
     }
-    protected void verifyGetCommandNameCalled(int times){
-        verify(request,times(times)).getPathInfo();
+
+    protected void verifyGetCommandNameCalled(int times) {
+        verify(request, times(times)).getPathInfo();
     }
-    protected void verifyError404Called(){
+
+    protected void verifyError404Called() {
         try {
-            verify(response,times(1)).sendError(HttpStatus.SC_NOT_FOUND);
+            verify(response, times(1)).sendError(HttpStatus.SC_NOT_FOUND);
         } catch (IOException e) {
             Assert.fail();
         }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/RefineTest.java b/OpenRefine/main/tests/server/src/com/google/refine/RefineTest.java
index 8c74026b1..5d8a78531 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/RefineTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/RefineTest.java
@@ -46,7 +46,6 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
-import org.powermock.modules.testng.PowerMockTestCase;
 import org.slf4j.Logger;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -81,12 +80,12 @@ import edu.mit.simile.butterfly.ButterflyModule;
 /**
  * A base class containing various utilities to help testing Refine.
  */
-public class RefineTest extends PowerMockTestCase {
+public class RefineTest {
 
     protected static Properties bindings = null;
 
     protected Logger logger;
-    
+
     boolean testFailed;
     protected File workspaceDir;
     protected RefineServlet servlet;
@@ -94,18 +93,17 @@ public class RefineTest extends PowerMockTestCase {
     private List<ImportingJob> importingJobs = new ArrayList<ImportingJob>();
 
     @BeforeSuite
-    public void init() {       
+    public void init() {
         System.setProperty("log4j.configuration", "tests.log4j.properties");
         try {
             workspaceDir = TestUtils.createTempDirectory("openrefine-test-workspace-dir");
             File jsonPath = new File(workspaceDir, "workspace.json");
-            FileUtils.writeStringToFile(jsonPath, "{\"projectIDs\":[]\n" + 
+            FileUtils.writeStringToFile(jsonPath, "{\"projectIDs\":[]\n" +
                     ",\"preferences\":{\"entries\":{\"scripting.starred-expressions\":" +
                     "{\"class\":\"com.google.refine.preference.TopList\",\"top\":2147483647," +
                     "\"list\":[]},\"scripting.expressions\":{\"class\":\"com.google.refine.preference.TopList\",\"top\":100,\"list\":[]}}}}",
                     "UTF-8"); // JSON is always UTF-8
             FileProjectManager.initialize(workspaceDir);
-            
 
         } catch (IOException e) {
             workspaceDir = null;
@@ -121,7 +119,7 @@ public class RefineTest extends PowerMockTestCase {
         ProjectManager.singleton = new ProjectManagerStub();
         ImportingManager.initialize(servlet);
     }
-    
+
     protected Project createProjectWithColumns(String projectName, String... columnNames) throws IOException, ModelException {
         Project project = new Project();
         ProjectMetadata pm = new ProjectMetadata();
@@ -129,71 +127,68 @@ public class RefineTest extends PowerMockTestCase {
         ProjectManager.singleton.registerProject(project, pm);
 
         if (columnNames != null) {
-            for(String columnName : columnNames) {
+            for (String columnName : columnNames) {
                 int index = project.columnModel.allocateNewCellIndex();
-                Column column = new Column(index,columnName);
+                Column column = new Column(index, columnName);
                 project.columnModel.addColumn(index, column, true);
             }
         }
         return project;
     }
-    
+
     /**
-     * Helper to create a project from a CSV encoded as a file. Not much
-     * control is given on the import options, because this method is intended
-     * to be a quick way to create a project for a test. For more control over
-     * the import, just call the importer directly.
+     * Helper to create a project from a CSV encoded as a file. Not much control is given on the import options, because
+     * this method is intended to be a quick way to create a project for a test. For more control over the import, just
+     * call the importer directly.
      * 
      * @param input
-     *          contents of the CSV file to create the project from
+     *            contents of the CSV file to create the project from
      * @return
      */
     protected Project createCSVProject(String input) {
         return createCSVProject("test project", input);
     }
-    
+
     /**
-     * Helper to create a project from a CSV encoded as a file. Not much
-     * control is given on the import options, because this method is intended
-     * to be a quick way to create a project for a test. For more control over
-     * the import, just call the importer directly.
+     * Helper to create a project from a CSV encoded as a file. Not much control is given on the import options, because
+     * this method is intended to be a quick way to create a project for a test. For more control over the import, just
+     * call the importer directly.
      * 
-     * The projects created via this method and their importing jobs will be disposed of
-     * at the end of each test.
+     * The projects created via this method and their importing jobs will be disposed of at the end of each test.
      * 
      * @param projectName
-     *       the name of the project to create
+     *            the name of the project to create
      * @param input
-     *       the content of the file, encoded as a CSV (with "," as a separator)
+     *            the content of the file, encoded as a CSV (with "," as a separator)
      * @return
      */
     protected Project createCSVProject(String projectName, String input) {
 
-        
         Project project = new Project();
-        
+
         ProjectMetadata metadata = new ProjectMetadata();
         metadata.setName(projectName);
-        
+
         ObjectNode options = mock(ObjectNode.class);
         prepareImportOptions(options, ",", -1, 0, 0, 1, false, false);
-        
+
         ImportingJob job = ImportingManager.createJob();
-        
+
         SeparatorBasedImporter importer = new SeparatorBasedImporter();
-        
+
         List<Exception> exceptions = new ArrayList<Exception>();
         importer.parseOneFile(project, metadata, job, "filesource", new StringReader(input), -1, options, exceptions);
         project.update();
         ProjectManager.singleton.registerProject(project, metadata);
-        
+
         projects.add(project);
         importingJobs.add(job);
         return project;
     }
-    
+
     /**
      * Initializes the importing options for the CSV importer.
+     * 
      * @param options
      * @param sep
      * @param limit
@@ -206,37 +201,40 @@ public class RefineTest extends PowerMockTestCase {
     public static void prepareImportOptions(ObjectNode options,
             String sep, int limit, int skip, int ignoreLines,
             int headerLines, boolean guessValueType, boolean ignoreQuotes) {
-            
-            whenGetStringOption("separator", options, sep);
-            whenGetIntegerOption("limit", options, limit);
-            whenGetIntegerOption("skipDataLines", options, skip);
-            whenGetIntegerOption("ignoreLines", options, ignoreLines);
-            whenGetIntegerOption("headerLines", options, headerLines);
-            whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
-            whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
-            whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
+
+        whenGetStringOption("separator", options, sep);
+        whenGetIntegerOption("limit", options, limit);
+        whenGetIntegerOption("skipDataLines", options, skip);
+        whenGetIntegerOption("ignoreLines", options, ignoreLines);
+        whenGetIntegerOption("headerLines", options, headerLines);
+        whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
+        whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
     }
-    
+
     /**
      * Cleans up the projects and jobs created with createCSVProject
      */
     @AfterMethod
     protected void cleanupProjectsAndJobs() {
-        for(ImportingJob job : importingJobs) {
+        for (ImportingJob job : importingJobs) {
             ImportingManager.disposeJob(job.id);
         }
-        for(Project project: projects) {
+        for (Project project : projects) {
             ProjectManager.singleton.deleteProject(project.id);
         }
         servlet = null;
     }
-            
+
     /**
      * Check that a project was created with the appropriate number of columns and rows.
      * 
-     * @param project project to check
-     * @param numCols expected column count
-     * @param numRows expected row count
+     * @param project
+     *            project to check
+     * @param numCols
+     *            expected column count
+     * @param numRows
+     *            expected row count
      */
     public static void assertProjectCreated(Project project, int numCols, int numRows) {
         Assert.assertNotNull(project);
@@ -250,70 +248,73 @@ public class RefineTest extends PowerMockTestCase {
     /**
      * Check that a project was created with the appropriate number of columns, rows, and records.
      * 
-     * @param project project to check
-     * @param numCols expected column count
-     * @param numRows expected row count
-     * @param numRows expected record count
+     * @param project
+     *            project to check
+     * @param numCols
+     *            expected column count
+     * @param numRows
+     *            expected row count
+     * @param numRows
+     *            expected record count
      */
     public static void assertProjectCreated(Project project, int numCols, int numRows, int numRecords) {
-        assertProjectCreated(project,numCols,numRows);
+        assertProjectCreated(project, numCols, numRows);
         Assert.assertNotNull(project.recordModel);
-        Assert.assertEquals(project.recordModel.getRecordCount(),numRecords);
+        Assert.assertEquals(project.recordModel.getRecordCount(), numRecords);
     }
 
     public void log(Project project) {
         // some quick and dirty debugging
         StringBuilder sb = new StringBuilder();
-        for(Column c : project.columnModel.columns){
+        for (Column c : project.columnModel.columns) {
             sb.append(c.getName());
             sb.append("; ");
         }
         logger.info(sb.toString());
-        for(Row r : project.rows){
+        for (Row r : project.rows) {
             sb = new StringBuilder();
-            for(int i = 0; i < r.cells.size(); i++){
+            for (int i = 0; i < r.cells.size(); i++) {
                 Cell c = r.getCell(i);
-                if(c != null){
-                   sb.append(c.value);
-                   sb.append("; ");
-                }else{
+                if (c != null) {
+                    sb.append(c.value);
+                    sb.append("; ");
+                } else {
                     sb.append("null; ");
                 }
             }
             logger.info(sb.toString());
         }
     }
-    
-    //----helpers----
-    
-    
-    static public void whenGetBooleanOption(String name, ObjectNode options, Boolean def){
+
+    // ----helpers----
+
+    static public void whenGetBooleanOption(String name, ObjectNode options, Boolean def) {
         when(options.has(name)).thenReturn(true);
         when(options.get(name)).thenReturn(def ? BooleanNode.TRUE : BooleanNode.FALSE);
     }
-    
-    static public void whenGetIntegerOption(String name, ObjectNode options, int def){
+
+    static public void whenGetIntegerOption(String name, ObjectNode options, int def) {
         when(options.has(name)).thenReturn(true);
         when(options.get(name)).thenReturn(new IntNode(def));
     }
-    
-    static public void whenGetStringOption(String name, ObjectNode options, String def){
+
+    static public void whenGetStringOption(String name, ObjectNode options, String def) {
         when(options.has(name)).thenReturn(true);
         when(options.get(name)).thenReturn(new TextNode(def));
     }
-    
-    static public void whenGetObjectOption(String name, ObjectNode options, ObjectNode def){
+
+    static public void whenGetObjectOption(String name, ObjectNode options, ObjectNode def) {
         when(options.has(name)).thenReturn(true);
         when(options.get(name)).thenReturn(def);
     }
-    
-    static public void whenGetArrayOption(String name, ObjectNode options, ArrayNode def){
+
+    static public void whenGetArrayOption(String name, ObjectNode options, ArrayNode def) {
         when(options.has(name)).thenReturn(true);
         when(options.get(name)).thenReturn(def);
     }
-    
+
     // Works for both int, String, and JSON arrays
-    static public void verifyGetArrayOption(String name, ObjectNode options){
+    static public void verifyGetArrayOption(String name, ObjectNode options) {
         verify(options, times(1)).has(name);
         verify(options, times(1)).get(name);
     }
@@ -328,16 +329,15 @@ public class RefineTest extends PowerMockTestCase {
             bindings = new Properties();
         }
         if (function == null) {
-            throw new IllegalArgumentException("Unknown function "+name);
+            throw new IllegalArgumentException("Unknown function " + name);
         }
         if (args == null) {
-            return function.call(bindings,new Object[0]);
+            return function.call(bindings, new Object[0]);
         } else {
-            return function.call(bindings,args);
+            return function.call(bindings, args);
         }
     }
 
-
     /**
      * Parse and evaluate a GREL expression and compare the result to the expect value
      *
@@ -346,22 +346,21 @@ public class RefineTest extends PowerMockTestCase {
      * @throws ParsingException
      */
     protected void parseEval(Properties bindings, String[] test)
-    throws ParsingException {
+            throws ParsingException {
         Evaluable eval = MetaParser.parse("grel:" + test[0]);
         Object result = eval.evaluate(bindings);
         Assert.assertEquals(result.toString(), test[1], "Wrong result for expression: " + test[0]);
     }
 
     /**
-     * Parse and evaluate a GREL expression and compare the result an expected
-     * type using instanceof
+     * Parse and evaluate a GREL expression and compare the result an expected type using instanceof
      *
      * @param bindings
      * @param test
      * @throws ParsingException
      */
     protected void parseEvalType(Properties bindings, String test, @SuppressWarnings("rawtypes") Class clazz)
-    throws ParsingException {
+            throws ParsingException {
         Evaluable eval = MetaParser.parse("grel:" + test);
         Object result = eval.evaluate(bindings);
         Assert.assertTrue(clazz.isInstance(result), "Wrong result type for expression: " + test);
@@ -390,6 +389,6 @@ public class RefineTest extends PowerMockTestCase {
         } catch (InterruptedException e) {
             Assert.fail("Test interrupted");
         }
-        Assert.assertFalse(process.isRunning(),"Process failed to complete within timeout " + timeout);
+        Assert.assertFalse(process.isRunning(), "Process failed to complete within timeout " + timeout);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java
index b6bf06d23..30960258e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/DecoratedValueTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing;
 
 import java.time.OffsetDateTime;
@@ -34,6 +35,7 @@ import com.google.refine.browsing.DecoratedValue;
 import com.google.refine.util.TestUtils;
 
 public class DecoratedValueTests {
+
     @Test
     public void serializeDecoratedValue() {
         OffsetDateTime date = OffsetDateTime.parse("2017-03-04T12:56:32Z");
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java
index 57cb2a18c..9b0c78fa1 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineConfigTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing;
 
 import org.testng.Assert;
@@ -34,9 +35,8 @@ import com.google.refine.util.TestUtils;
 import com.google.refine.browsing.EngineConfig;
 
 public class EngineConfigTests {
-    
-    public static String engineConfigJson =
-              "{\n"
+
+    public static String engineConfigJson = "{\n"
             + "      \"mode\": \"row-based\",\n"
             + "      \"facets\": [\n"
             + "        {\n"
@@ -50,34 +50,33 @@ public class EngineConfigTests {
             + "        }\n"
             + "      ]\n"
             + "    }";
-    
-    public static String engineConfigRecordModeJson =
-             "{"
+
+    public static String engineConfigRecordModeJson = "{"
             + "    \"mode\":\"record-based\","
             + "    \"facets\":[]"
             + "}";
-    
+
     public static String noFacetProvided = "{\"mode\":\"row-based\"}";
-    
+
     @Test
     public void serializeEngineConfig() {
         EngineConfig ec = EngineConfig.reconstruct(engineConfigJson);
         TestUtils.isSerializedTo(ec, engineConfigJson);
     }
-    
+
     @Test
     public void serializeEngineConfigRecordMode() {
         EngineConfig ec = EngineConfig.reconstruct(engineConfigRecordModeJson);
         TestUtils.isSerializedTo(ec, engineConfigRecordModeJson);
     }
-    
+
     @Test
     public void reconstructNullEngineConfig() {
         EngineConfig ec = EngineConfig.reconstruct(null);
         Assert.assertEquals(ec.getMode(), Mode.RowBased);
         Assert.assertTrue(ec.getFacetConfigs().isEmpty());
     }
-    
+
     @Test
     public void reconstructNoFacetsProvided() {
         EngineConfig ec = EngineConfig.reconstruct(noFacetProvided);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineTests.java
index 179932dbe..2fcbe1f2d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/EngineTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing;
 
 import static org.mockito.Mockito.mock;
@@ -34,8 +35,8 @@ import com.google.refine.browsing.Engine;
 import com.google.refine.model.Project;
 import com.google.refine.util.TestUtils;
 
-
 public class EngineTests {
+
     @Test
     public void serializeEngine() {
         Project project = mock(Project.class);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java
index adc61ddf7..38b22be6a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing.facets;
 
 import java.io.IOException;
@@ -41,7 +42,7 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ListFacetTests extends RefineTest {
-    
+
     private static String jsonConfig = "{"
             + "\"type\":\"list\","
             + "\"name\":\"facet A\","
@@ -54,15 +55,15 @@ public class ListFacetTests extends RefineTest {
             + "\"selectError\":false,"
             + "\"invert\":false"
             + "}";
-    
+
     private static String jsonFacetError = "{"
             + "\"name\":\"facet A\","
             + "\"expression\":\"value+\\\"bar\\\"\","
             + "\"columnName\":\"Column A\","
             + "\"invert\":false,"
-            + "\"error\":\"No column named Column A\"" + 
+            + "\"error\":\"No column named Column A\"" +
             "}";
-    
+
     private static String jsonFacet = "{"
             + "\"name\":\"facet A\","
             + "\"expression\":\"value+\\\"bar\\\"\","
@@ -72,62 +73,62 @@ public class ListFacetTests extends RefineTest {
             + "     {\"v\":{\"v\":\"foobar\",\"l\":\"foobar\"},\"c\":1,\"s\":true},"
             + "     {\"v\":{\"v\":\"barbar\",\"l\":\"barbar\"},\"c\":1,\"s\":false}"
             + "]}";
-    
+
     private static String selectedEmptyChoiceFacet = "{"
-    		+ "\"name\":\"facet A\","
-    		+ "\"expression\":\"value+\\\"bar\\\"\","
-    		+ "\"columnName\":\"Column A\","
-    		+ "\"invert\":false,"
-    		+ "\"choices\":["
-    		+ "    {\"v\":{\"v\":\"ebar\",\"l\":\"ebar\"},\"c\":1,\"s\":false},"
-    		+ "    {\"v\":{\"v\":\"cbar\",\"l\":\"cbar\"},\"c\":1,\"s\":false},"
-    		+ "    {\"v\":{\"v\":\"abar\",\"l\":\"abar\"},\"c\":1,\"s\":false},"
-    		+ "    {\"v\":{\"v\":\"foobar\",\"l\":\"true\"},\"c\":0,\"s\":true}"
-    		+ "]}";
+            + "\"name\":\"facet A\","
+            + "\"expression\":\"value+\\\"bar\\\"\","
+            + "\"columnName\":\"Column A\","
+            + "\"invert\":false,"
+            + "\"choices\":["
+            + "    {\"v\":{\"v\":\"ebar\",\"l\":\"ebar\"},\"c\":1,\"s\":false},"
+            + "    {\"v\":{\"v\":\"cbar\",\"l\":\"cbar\"},\"c\":1,\"s\":false},"
+            + "    {\"v\":{\"v\":\"abar\",\"l\":\"abar\"},\"c\":1,\"s\":false},"
+            + "    {\"v\":{\"v\":\"foobar\",\"l\":\"true\"},\"c\":0,\"s\":true}"
+            + "]}";
 
     @Test
     public void serializeListFacetConfig() throws JsonParseException, JsonMappingException, IOException {
         ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
         TestUtils.isSerializedTo(facetConfig, jsonConfig);
     }
-    
+
     @Test
     public void serializeListFacet() throws JsonParseException, JsonMappingException, IOException {
         Project project = createCSVProject("Column A\n" +
                 "foo\n" +
                 "bar\n");
         Engine engine = new Engine(project);
-        
+
         ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
-        
+
         Facet facet = facetConfig.apply(project);
         facet.computeChoices(project, engine.getAllFilteredRows());
-        
+
         TestUtils.isSerializedTo(facet, jsonFacet);
     }
-    
+
     @Test
     public void serializeListFacetWithError() throws JsonParseException, JsonMappingException, IOException {
         Project project = createCSVProject("other column\n" +
                 "foo\n" +
                 "bar\n");
-       
+
         ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
         Facet facet = facetConfig.apply(project);
         TestUtils.isSerializedTo(facet, jsonFacetError);
     }
-    
+
     @Test
     public void testSelectedEmptyChoice() throws IOException {
-    	Project project = createCSVProject("Column A\n" + 
-    			"a\n" + 
-    			"c\n" + 
-    			"e");
-    	Engine engine = new Engine(project);
-    	
-    	ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
-    	Facet facet = facetConfig.apply(project);
-    	facet.computeChoices(project, engine.getAllFilteredRows());
-    	TestUtils.isSerializedTo(facet, selectedEmptyChoiceFacet);
+        Project project = createCSVProject("Column A\n" +
+                "a\n" +
+                "c\n" +
+                "e");
+        Engine engine = new Engine(project);
+
+        ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);
+        Facet facet = facetConfig.apply(project);
+        facet.computeChoices(project, engine.getAllFilteredRows());
+        TestUtils.isSerializedTo(facet, selectedEmptyChoiceFacet);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java
index 2d7fd5b63..1f92bceec 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/NominalFacetChoiceTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing.facets;
 
 import org.testng.annotations.Test;
@@ -33,6 +34,7 @@ import com.google.refine.browsing.facets.NominalFacetChoice;
 import com.google.refine.util.TestUtils;
 
 public class NominalFacetChoiceTests {
+
     @Test
     public void serializeNominalFacetChoice() {
         DecoratedValue value = new DecoratedValue("some string", "some string");
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java
index 465daf065..c0996ff28 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/RangeFacetTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing.facets;
 
 import java.io.IOException;
@@ -42,19 +43,20 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class RangeFacetTests extends RefineTest {
-    public static String configJson = "{\n" + 
-            "          \"selectNumeric\": true,\n" + 
-            "          \"expression\": \"value\",\n" + 
-            "          \"selectBlank\": true,\n" + 
-            "          \"selectNonNumeric\": true,\n" + 
-            "          \"selectError\": true,\n" + 
-            "          \"name\": \"my column\",\n" + 
-            "          \"from\": -30,\n" + 
-            "          \"to\": 90,\n" + 
-            "          \"type\": \"range\",\n" + 
-            "          \"columnName\": \"my column\"\n" + 
+
+    public static String configJson = "{\n" +
+            "          \"selectNumeric\": true,\n" +
+            "          \"expression\": \"value\",\n" +
+            "          \"selectBlank\": true,\n" +
+            "          \"selectNonNumeric\": true,\n" +
+            "          \"selectError\": true,\n" +
+            "          \"name\": \"my column\",\n" +
+            "          \"from\": -30,\n" +
+            "          \"to\": 90,\n" +
+            "          \"type\": \"range\",\n" +
+            "          \"columnName\": \"my column\"\n" +
             "        }";
-    
+
     public static String facetJson = "{"
             + "\"name\":\"my column\","
             + "\"expression\":\"value\","
@@ -74,13 +76,13 @@ public class RangeFacetTests extends RefineTest {
             + "\"nonNumericCount\":1,"
             + "\"blankCount\":0,"
             + "\"errorCount\":0}";
-    
+
     @Test
     public void serializeRangeFacetConfig() throws JsonParseException, JsonMappingException, IOException {
         RangeFacetConfig config = ParsingUtilities.mapper.readValue(configJson, RangeFacetConfig.class);
         TestUtils.isSerializedTo(config, configJson);
     }
-    
+
     @Test
     public void serializeRangeFacet() throws JsonParseException, JsonMappingException, IOException {
         Project project = createCSVProject("my column\n"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java
index b788ee041..6aa795bf3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/ScatterplotFacetTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing.facets;
 
 import static org.testng.Assert.assertFalse;
@@ -46,23 +47,24 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ScatterplotFacetTests extends RefineTest {
-    public static String configJson = "{\n" + 
-            "          \"to_x\": 1,\n" + 
-            "          \"to_y\": 1,\n" + 
-            "          \"dot\": 1,\n" + 
-            "          \"from_x\": 0.21333333333333335,\n" + 
-            "          \"l\": 150,\n" + 
-            "          \"type\": \"scatterplot\",\n" + 
-            "          \"from_y\": 0.26666666666666666,\n" + 
-            "          \"dim_y\": \"lin\",\n" + 
-            "          \"ex\": \"value\",\n" + 
+
+    public static String configJson = "{\n" +
+            "          \"to_x\": 1,\n" +
+            "          \"to_y\": 1,\n" +
+            "          \"dot\": 1,\n" +
+            "          \"from_x\": 0.21333333333333335,\n" +
+            "          \"l\": 150,\n" +
+            "          \"type\": \"scatterplot\",\n" +
+            "          \"from_y\": 0.26666666666666666,\n" +
+            "          \"dim_y\": \"lin\",\n" +
+            "          \"ex\": \"value\",\n" +
             "          \"dim_x\": \"lin\",\n" +
-            "          \"ey\": \"value\",\n" + 
-            "          \"cx\": \"my column\",\n" + 
-            "          \"cy\": \"e\",\n" + 
-            "          \"name\": \"my column (x) vs. e (y)\"\n" + 
+            "          \"ey\": \"value\",\n" +
+            "          \"cx\": \"my column\",\n" +
+            "          \"cy\": \"e\",\n" +
+            "          \"name\": \"my column (x) vs. e (y)\"\n" +
             "        }";
-    
+
     public static String facetJson = "{"
             + "\"name\":\"my column (x) vs. e (y)\","
             + "\"cx\":\"my column\","
@@ -80,19 +82,19 @@ public class ScatterplotFacetTests extends RefineTest {
             + "\"from_y\":0.26666666666666666,"
             + "\"to_y\":1"
             + "}";
-    
+
     @Test
     public void serializeScatterplotFacetConfig() throws JsonParseException, JsonMappingException, IOException {
         ScatterplotFacetConfig config = ParsingUtilities.mapper.readValue(configJson, ScatterplotFacetConfig.class);
         TestUtils.isSerializedTo(config, configJson);
     }
-    
+
     @Test
     public void serializeScatterplotFacet() throws JsonParseException, JsonMappingException, IOException {
         Project project = createCSVProject("my column,e\n"
-                + "89.2,89.2\n" + 
-                "-45.9,-45.9\n" + 
-                "blah,blah\n" + 
+                + "89.2,89.2\n" +
+                "-45.9,-45.9\n" +
+                "blah,blah\n" +
                 "0.4,0.4\n");
         Engine engine = new Engine(project);
         project.rows.get(0).cells.set(0, new Cell(89.2, null));
@@ -101,13 +103,13 @@ public class ScatterplotFacetTests extends RefineTest {
         project.rows.get(1).cells.set(1, new Cell(-45.9, null));
         project.rows.get(3).cells.set(0, new Cell(0.4, null));
         project.rows.get(3).cells.set(1, new Cell(0.4, null));
-        
+
         ScatterplotFacetConfig config = ParsingUtilities.mapper.readValue(configJson, ScatterplotFacetConfig.class);
-        
+
         ScatterplotFacet facet = config.apply(project);
         facet.computeChoices(project, engine.getAllFilteredRows());
         TestUtils.isSerializedTo(facet, facetJson);
-        
+
         RowFilter filter = facet.getRowFilter(project);
         assertTrue(filter.filterRow(project, 0, project.rows.get(0)));
         assertFalse(filter.filterRow(project, 1, project.rows.get(1)));
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java
index f2181707e..7c822153a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TextSearchFacetTests.java
@@ -52,8 +52,8 @@ import com.google.refine.browsing.facets.TextSearchFacet.TextSearchFacetConfig;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class TextSearchFacetTests extends RefineTest {
+
     // dependencies
     private Project project;
     private TextSearchFacetConfig textfilterconfig;
@@ -66,7 +66,7 @@ public class TextSearchFacetTests extends RefineTest {
             + "\"caseSensitive\":true,"
             + "\"invert\":false,"
             + "\"query\":\"A\"}";
-    
+
     private String sensitiveFacetJson = "{\"name\":\"Value\","
             + "\"columnName\":\"Value\","
             + "\"query\":\"A\","
@@ -83,122 +83,122 @@ public class TextSearchFacetTests extends RefineTest {
     @BeforeMethod
     public void setUp() throws IOException, ModelException {
         project = createCSVProject("TextSearchFacet",
-             "Value\n"
-            + "a\n"
-            + "b\n"
-            + "ab\n"
-            + "Abc\n");
+                "Value\n"
+                        + "a\n"
+                        + "b\n"
+                        + "ab\n"
+                        + "Abc\n");
     }
-    
+
     private void configureFilter(String filter) throws JsonParseException, JsonMappingException, IOException {
-        //Add the facet to the project and create a row filter
+        // Add the facet to the project and create a row filter
         textfilterconfig = ParsingUtilities.mapper.readValue(filter, TextSearchFacetConfig.class);
         textfilter = textfilterconfig.apply(project);
         rowfilter = textfilter.getRowFilter(project);
     }
-    
+
     /**
      * Test to demonstrate the intended behaviour of the function
      */
 
     @Test
     public void testTextFilter() throws Exception {
-        //Apply text filter "a"
+        // Apply text filter "a"
+
+        // Column: "Value"
+        // Filter Query: "a"
+        // Mode: "text"
+        // Case sensitive: False
+        // Invert: False
+        String filter = "{\"type\":\"text\","
+                + "\"name\":\"Value\","
+                + "\"columnName\":\"Value\","
+                + "\"mode\":\"text\","
+                + "\"caseSensitive\":false,"
+                + "\"invert\":false,"
+                + "\"query\":\"a\"}";
 
-        //Column: "Value"
-        //Filter Query: "a"
-        //Mode: "text"
-        //Case sensitive: False
-        //Invert: False
-        String filter =     "{\"type\":\"text\","
-                            + "\"name\":\"Value\","
-                            + "\"columnName\":\"Value\","
-                            + "\"mode\":\"text\","
-                            + "\"caseSensitive\":false,"
-                            + "\"invert\":false,"
-                            + "\"query\":\"a\"}";
-        
         configureFilter(filter);
 
-        //Check each row in the project against the filter
-        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),true);
-        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),true);
-        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),true);
+        // Check each row in the project against the filter
+        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)), true);
+        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)), true);
+        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)), true);
     }
 
     @Test
     public void testInvertedTextFilter() throws Exception {
-        //Apply inverted text filter "a"
+        // Apply inverted text filter "a"
+
+        // Column: "Value"
+        // Filter Query: "a"
+        // Mode: "text"
+        // Case sensitive: False
+        // Invert: True
+        String filter = "{\"type\":\"text\","
+                + "\"name\":\"Value\","
+                + "\"columnName\":\"Value\","
+                + "\"mode\":\"text\","
+                + "\"caseSensitive\":false,"
+                + "\"invert\":true,"
+                + "\"query\":\"a\"}";
 
-        //Column: "Value"
-        //Filter Query: "a"
-        //Mode: "text"
-        //Case sensitive: False
-        //Invert: True
-        String filter =     "{\"type\":\"text\","
-                            + "\"name\":\"Value\","
-                            + "\"columnName\":\"Value\","
-                            + "\"mode\":\"text\","
-                            + "\"caseSensitive\":false,"
-                            + "\"invert\":true,"
-                            + "\"query\":\"a\"}";
-        
         configureFilter(filter);
 
-        //Check each row in the project against the filter
-        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),true);
-        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),false);
+        // Check each row in the project against the filter
+        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)), true);
+        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)), false);
     }
 
     @Test
     public void testRegExFilter() throws Exception {
-        //Apply regular expression filter "[bc]"
+        // Apply regular expression filter "[bc]"
+
+        // Column: "Value"
+        // Filter Query: "[bc]"
+        // Mode: "regex"
+        // Case sensitive: False
+        // Invert: False
+        String filter = "{\"type\":\"text\","
+                + "\"name\":\"Value\","
+                + "\"columnName\":\"Value\","
+                + "\"mode\":\"regex\","
+                + "\"caseSensitive\":false,"
+                + "\"invert\":false,"
+                + "\"query\":\"[bc]\"}";
 
-        //Column: "Value"
-        //Filter Query: "[bc]"
-        //Mode: "regex"
-        //Case sensitive: False
-        //Invert: False
-        String filter =     "{\"type\":\"text\","
-                            + "\"name\":\"Value\","
-                            + "\"columnName\":\"Value\","
-                            + "\"mode\":\"regex\","
-                            + "\"caseSensitive\":false,"
-                            + "\"invert\":false,"
-                            + "\"query\":\"[bc]\"}";
-        
         configureFilter(filter);
 
-        //Check each row in the project against the filter
-        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),true);
-        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),true);
-        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),true);
+        // Check each row in the project against the filter
+        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)), true);
+        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)), true);
+        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)), true);
     }
 
     @Test
     public void testCaseSensitiveFilter() throws Exception {
-        //Apply case-sensitive filter "A"
-        
+        // Apply case-sensitive filter "A"
+
         configureFilter(sensitiveConfigJson);
 
-        //Check each row in the project against the filter
-        //Expect to retrieve one row containing "Abc"
-        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)),false);
-        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)),true);
+        // Check each row in the project against the filter
+        // Expect to retrieve one row containing "Abc"
+        Assert.assertEquals(rowfilter.filterRow(project, 0, project.rows.get(0)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 1, project.rows.get(1)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 2, project.rows.get(2)), false);
+        Assert.assertEquals(rowfilter.filterRow(project, 3, project.rows.get(3)), true);
     }
-    
+
     @Test
     public void serializeTextSearchFacetConfig() throws JsonParseException, JsonMappingException, IOException {
         TextSearchFacetConfig config = ParsingUtilities.mapper.readValue(sensitiveConfigJson, TextSearchFacetConfig.class);
         TestUtils.isSerializedTo(config, sensitiveConfigJson);
     }
-    
+
     @Test
     public void serializeTextSearchFacet() throws JsonParseException, JsonMappingException, IOException {
         TextSearchFacetConfig config = ParsingUtilities.mapper.readValue(sensitiveConfigJson, TextSearchFacetConfig.class);
@@ -206,4 +206,3 @@ public class TextSearchFacetTests extends RefineTest {
         TestUtils.isSerializedTo(facet, sensitiveFacetJson);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java
index 3137011e3..2bf356d45 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/facets/TimeRangeFacetTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.browsing.facets;
 
 import java.io.IOException;
@@ -42,9 +43,8 @@ import com.google.refine.model.Project;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class TimeRangeFacetTests extends RefineTest {
-    
+
     public static String facetJson = "{"
             + "\"name\":\"my column\","
             + "\"expression\":\"value\","
@@ -64,26 +64,26 @@ public class TimeRangeFacetTests extends RefineTest {
             + "\"nonTimeCount\":1,"
             + "\"blankCount\":0,"
             + "\"errorCount\":0}";
-    
-    public static String configJson = "{\n" + 
-            "          \"selectNonTime\": true,\n" + 
-            "          \"expression\": \"value\",\n" + 
-            "          \"selectBlank\": true,\n" + 
-            "          \"selectError\": true,\n" + 
-            "          \"selectTime\": true,\n" + 
-            "          \"name\": \"my column\",\n" + 
-            "          \"from\": 1262443349000,\n" + 
-            "          \"to\": 1514966950000,\n" + 
-            "          \"type\": \"timerange\",\n" + 
-            "          \"columnName\": \"my column\"\n" + 
+
+    public static String configJson = "{\n" +
+            "          \"selectNonTime\": true,\n" +
+            "          \"expression\": \"value\",\n" +
+            "          \"selectBlank\": true,\n" +
+            "          \"selectError\": true,\n" +
+            "          \"selectTime\": true,\n" +
+            "          \"name\": \"my column\",\n" +
+            "          \"from\": 1262443349000,\n" +
+            "          \"to\": 1514966950000,\n" +
+            "          \"type\": \"timerange\",\n" +
+            "          \"columnName\": \"my column\"\n" +
             "        }";
-    
+
     @Test
     public void serializeTimeRangeFacetConfig() throws JsonParseException, JsonMappingException, IOException {
         TimeRangeFacetConfig config = ParsingUtilities.mapper.readValue(configJson, TimeRangeFacetConfig.class);
         TestUtils.isSerializedTo(config, configJson);
     }
-    
+
     @Test
     public void serializeTimeRangeFacet() throws JsonParseException, JsonMappingException, IOException {
         Project project = createCSVProject("my column\n"
@@ -94,7 +94,7 @@ public class TimeRangeFacetTests extends RefineTest {
         project.rows.get(0).cells.set(0, new Cell(OffsetDateTime.parse("2018-01-03T08:09:10Z"), null));
         project.rows.get(2).cells.set(0, new Cell(OffsetDateTime.parse("2008-01-03T03:04:05Z"), null));
         project.rows.get(3).cells.set(0, new Cell(OffsetDateTime.parse("2012-04-05T02:00:01Z"), null));
-        
+
         Engine engine = new Engine(project);
         TimeRangeFacetConfig config = ParsingUtilities.mapper.readValue(configJson, TimeRangeFacetConfig.class);
         TimeRangeFacet facet = config.apply(project);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java b/OpenRefine/main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java
index 00ec32a6c..8565fcd76 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/browsing/util/ExpressionNominalValueGrouperTests.java
@@ -52,24 +52,24 @@ import com.google.refine.model.Project;
 import com.google.refine.model.Row;
 
 public class ExpressionNominalValueGrouperTests extends RefineTest {
-    // dependencies    
-    //Variables
+
+    // dependencies
+    // Variables
     private static Project project;
     private static Properties bindings;
-    
+
     private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
     private static String dateTimeStringValue = "2017-05-12T05:45:00Z";
     private static int integerValue = 1;
     private static String integerStringValue = "1";
     private static String stringStringValue = "a";
-    
+
     private static ExpressionNominalValueGrouper grouper;
     private static Evaluable eval;
     private static final int cellIndex = 0;
     private static final String columnName = "Col1";
     private static final int numberOfRows = 5;
     private static final String projectName = "ExpressionNominalValueGrouper";
-    
 
     @Override
     @BeforeTest
@@ -79,11 +79,11 @@ public class ExpressionNominalValueGrouperTests extends RefineTest {
 
     @BeforeMethod
     public void setUp() throws IOException, ModelException {
-      project = createProjectWithColumns(projectName, columnName);
-      bindings = new Properties();
-      bindings.put("project", project);
+        project = createProjectWithColumns(projectName, columnName);
+        bindings = new Properties();
+        bindings.put("project", project);
     }
-    
+
     @AfterMethod
     public void tearDown() {
         project = null;
@@ -91,87 +91,87 @@ public class ExpressionNominalValueGrouperTests extends RefineTest {
 
     @Test
     public void expressionNominalValueGrouperStrings() throws Exception {
-      //populate project
-      // Five rows of a's
-      for (int i = 0; i < numberOfRows; i++) {
-          Row row = new Row(1);
-          row.setCell(0, new Cell(stringStringValue, null));
-          project.rows.add(row);
-      }
-      //create grouper
-      eval = MetaParser.parse("value");
-      grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
-      try {
-          grouper.start(project);
-          for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
-              Row row = project.rows.get(rowIndex);
-              grouper.visit(project, rowIndex, row);
-          }
-      } finally {
-          grouper.end(project);
-      }
-      
-      Assert.assertEquals(grouper.choices.size(),1);
-      
-      Assert.assertTrue(grouper.choices.containsKey(stringStringValue));
-      Assert.assertEquals(grouper.choices.get(stringStringValue).decoratedValue.label,stringStringValue);
-      Assert.assertEquals(grouper.choices.get(stringStringValue).decoratedValue.value.toString(),stringStringValue);
+        // populate project
+        // Five rows of a's
+        for (int i = 0; i < numberOfRows; i++) {
+            Row row = new Row(1);
+            row.setCell(0, new Cell(stringStringValue, null));
+            project.rows.add(row);
+        }
+        // create grouper
+        eval = MetaParser.parse("value");
+        grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
+        try {
+            grouper.start(project);
+            for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
+                Row row = project.rows.get(rowIndex);
+                grouper.visit(project, rowIndex, row);
+            }
+        } finally {
+            grouper.end(project);
+        }
+
+        Assert.assertEquals(grouper.choices.size(), 1);
+
+        Assert.assertTrue(grouper.choices.containsKey(stringStringValue));
+        Assert.assertEquals(grouper.choices.get(stringStringValue).decoratedValue.label, stringStringValue);
+        Assert.assertEquals(grouper.choices.get(stringStringValue).decoratedValue.value.toString(), stringStringValue);
     }
-    
+
     @Test
     public void expressionNominalValueGrouperInts() throws Exception {
-      //populate project
-      for (int i = 0; i < numberOfRows; i++) {
-          Row row = new Row(1);
-          row.setCell(0, new Cell(integerValue, null));
-          project.rows.add(row);
-      }
-      //create grouper
-      eval = MetaParser.parse("value");
-      grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
-      try {
-          grouper.start(project);
-          for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
-              Row row = project.rows.get(rowIndex);
-              grouper.visit(project, rowIndex, row);
-          }
-      } finally {
-          grouper.end(project);
-      }
-      
-      Assert.assertEquals(grouper.choices.size(),1);
-      
-      Assert.assertTrue(grouper.choices.containsKey(integerStringValue));
-      Assert.assertEquals(grouper.choices.get(integerStringValue).decoratedValue.label,integerStringValue);
-      Assert.assertEquals(grouper.choices.get(integerStringValue).decoratedValue.value.toString(),integerStringValue);
+        // populate project
+        for (int i = 0; i < numberOfRows; i++) {
+            Row row = new Row(1);
+            row.setCell(0, new Cell(integerValue, null));
+            project.rows.add(row);
+        }
+        // create grouper
+        eval = MetaParser.parse("value");
+        grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
+        try {
+            grouper.start(project);
+            for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
+                Row row = project.rows.get(rowIndex);
+                grouper.visit(project, rowIndex, row);
+            }
+        } finally {
+            grouper.end(project);
+        }
+
+        Assert.assertEquals(grouper.choices.size(), 1);
+
+        Assert.assertTrue(grouper.choices.containsKey(integerStringValue));
+        Assert.assertEquals(grouper.choices.get(integerStringValue).decoratedValue.label, integerStringValue);
+        Assert.assertEquals(grouper.choices.get(integerStringValue).decoratedValue.value.toString(), integerStringValue);
     }
-    
+
     @Test
     public void expressionNominalValueGrouperDates() throws Exception {
-      //populate project
-      for (int i = 0; i < numberOfRows; i++) {
-          Row row = new Row(1);
-          row.setCell(0, new Cell(dateTimeValue, null));
-          project.rows.add(row);
-      }
-      //create grouper
-      eval = MetaParser.parse("value");
-      grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
-      try {
-          grouper.start(project);
-          for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
-              Row row = project.rows.get(rowIndex);
-              grouper.visit(project, rowIndex, row);
-          }
-      } finally {
-          grouper.end(project);
-      }
-      
-      Assert.assertEquals(grouper.choices.size(),1);
-      
-      Assert.assertTrue(grouper.choices.containsKey(dateTimeStringValue));
-      Assert.assertEquals(grouper.choices.get(dateTimeStringValue).decoratedValue.label,dateTimeStringValue);
-      Assert.assertEquals(grouper.choices.get(dateTimeStringValue).decoratedValue.value.toString(),dateTimeStringValue);
+        // populate project
+        for (int i = 0; i < numberOfRows; i++) {
+            Row row = new Row(1);
+            row.setCell(0, new Cell(dateTimeValue, null));
+            project.rows.add(row);
+        }
+        // create grouper
+        eval = MetaParser.parse("value");
+        grouper = new ExpressionNominalValueGrouper(eval, columnName, cellIndex);
+        try {
+            grouper.start(project);
+            for (int rowIndex = 0; rowIndex < numberOfRows; rowIndex++) {
+                Row row = project.rows.get(rowIndex);
+                grouper.visit(project, rowIndex, row);
+            }
+        } finally {
+            grouper.end(project);
+        }
+
+        Assert.assertEquals(grouper.choices.size(), 1);
+
+        Assert.assertTrue(grouper.choices.containsKey(dateTimeStringValue));
+        Assert.assertEquals(grouper.choices.get(dateTimeStringValue).decoratedValue.label, dateTimeStringValue);
+        Assert.assertEquals(grouper.choices.get(dateTimeStringValue).decoratedValue.value.toString(), dateTimeStringValue);
     }
 
     @Test
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java b/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java
index 8d1405857..55b226638 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/BinningClustererTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.clustering.binning;
 
 import static org.testng.Assert.assertEquals;
@@ -42,30 +43,30 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class BinningClustererTests extends RefineTest {
-    
+
     String configJson = "{"
             + "\"type\":\"binning\","
             + "\"function\":\"fingerprint\","
             + "\"column\":\"values\","
             + "\"params\":{}}";
-    
+
     String configNgramJson = "{"
             + "\"type\":\"binning\","
             + "\"function\":\"ngram-fingerprint\","
             + "\"column\":\"values\","
             + "\"params\":{\"ngram-size\":2}}";
-    
+
     String clustererJson = "["
             + "  [{\"v\":\"a\",\"c\":1},{\"v\":\"à\",\"c\":1}],"
             + "  [{\"v\":\"c\",\"c\":1},{\"v\":\"ĉ\",\"c\":1}]"
             + "]";
-    
+
     @Test
     public void testSerializeBinningClustererConfig() throws JsonParseException, JsonMappingException, IOException {
         BinningClustererConfig config = ParsingUtilities.mapper.readValue(configJson, BinningClustererConfig.class);
         TestUtils.isSerializedTo(config, configJson);
     }
-    
+
     @Test
     public void testSerializeBinningClustererConfigWithNgrams() throws JsonParseException, JsonMappingException, IOException {
         BinningClustererConfig config = ParsingUtilities.mapper.readValue(configNgramJson, BinningClustererConfig.class);
@@ -84,15 +85,15 @@ public class BinningClustererTests extends RefineTest {
         clusterer.computeClusters(new Engine(project));
         TestUtils.isSerializedTo(clusterer, clustererJson);
     }
-    
+
     @Test
     public void testNoLonelyClusters() throws JsonParseException, JsonMappingException, IOException {
-    	Project project = createCSVProject("column\n"
+        Project project = createCSVProject("column\n"
                 + "c\n"
                 + "ĉ\n"
                 + "d\n");
-    	BinningClustererConfig config = ParsingUtilities.mapper.readValue(configJson, BinningClustererConfig.class);
-    	BinningClusterer clusterer = config.apply(project);
+        BinningClustererConfig config = ParsingUtilities.mapper.readValue(configJson, BinningClustererConfig.class);
+        BinningClusterer clusterer = config.apply(project);
         clusterer.computeClusters(new Engine(project));
         assertEquals(clusterer.getJsonRepresentation().size(), 1);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java b/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java
index d141fdf96..126517b82 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java
@@ -40,132 +40,137 @@ import org.testng.annotations.Test;
 
 import com.google.refine.RefineTest;
 
-
 public class KeyerTests extends RefineTest {
 
     private static Keyer keyer;
-    
+
     private static final String[][] testStrings = {
-        {"the multi multi word test","multi test the word"},
-        {" école ÉCole ecoLe ", "ecole"},
-        {"a b c d","a b c d"},
-        {" d c b a ","a b c d"},
-        {"\tABC \t DEF ","abc def"}, // test leading and trailing whitespace
-        {"bbb\taaa","aaa bbb"},
+            { "the multi multi word test", "multi test the word" },
+            { " école ÉCole ecoLe ", "ecole" },
+            { "a b c d", "a b c d" },
+            { " d c b a ", "a b c d" },
+            { "\tABC \t DEF ", "abc def" }, // test leading and trailing whitespace
+            { "bbb\taaa", "aaa bbb" },
 //        {"å","aa"}, // Requested by issue #650, but conflicts with diacritic folding
-        {"æø","aeoe"}, // Norwegian replacements from #650
-        {"©ß","css"}, // issue #409 esszet
-        {"\u00D0\u00F0\u00DE\u00FEǷƿ", "ddththww"}, // eth, thorn, & wynn for Icelandic / Olde English
-        {"fffiflffiſtst", "fffiflffistst"}, // ligatures
-        // Test legacy replacements
-        {"\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u0100\u0101\u0102\u0103\u0104\u0105", "aaaaaaaaaaaaaaaaaa"},
-        {"\u00C7\u00E7\u0106\u0107\u0108\u0109\u010A\u010B\u010C\u010D", "cccccccccc"},
-        {"\u00D0\u00F0\u010E\u010F\u0110\u0111", "dddddd"},
-        {"\u00C8\u00C9\u00CA\u00CB\u00E8\u00E9\u00EA\u00EB\u0112\u0113\u0114\u0115\u0116\u0117\u0118\u0119\u011A\u011B", "eeeeeeeeeeeeeeeeee"},
-        {"\u011C\u011D\u011E\u011F\u0120\u0121\u0122\u0123", "gggggggg"},
-        {"\u0124\u0125", "hh"},
-        {"\u0126\u0127", "hh"},
-        {"\u00CC\u00CD\u00CE\u00CF\u00EC\u00ED\u00EE\u00EF\u0128\u0129\u012A\u012B\u012C\u012D\u012E\u012F\u0130", "iiiiiiiiiiiiiiiii"},
-        {"\u0131", "i"},
-        {"\u0134\u0135", "jj"},
-        {"\u0136\u0137", "kk"},
-        {"\u0138", "k"},
-        {"\u0139\u013A\u013B\u013C\u013D\u013E\u0141\u0142", "llllllll"},
-        {"\u013F\u0140", "ll"},
-        {"\u00D1\u00F1\u0143\u0144\u0145\u0146\u0147\u0148", "nnnnnnnn"},
-        {"\u0149", "n"}, // decomposed to 'n, but then punctuation is stripped
-        {"\u014A\u014B", "nn"},
-        {"\u00D2\u00D3\u00D4\u00D5\u00D6\u00F2\u00F3\u00F4\u00F5\u00F6\u014C\u014D\u014E\u014F\u0150\u0151", "oooooooooooooooo"},
-        {"\u00D8\u00F8", "oeoe"}, // O with stroke we decompose to oe instead of o
-        {"\u0154\u0155\u0156\u0157\u0158\u0159", "rrrrrr"},
-        {"\u015A\u015B\u015C\u015D\u015E\u015F\u0160\u0161\u017F", "sssssssss"},
-        {"\u0162\u0163\u0164\u0165\u0166\u0167", "tttttt"},
-        {"\u00D9\u00DA\u00DB\u00DC\u00F9\u00FA\u00FB\u00FC\u0168\u0169\u016A\u016B\u016C\u016D\u016E\u016F\u0170\u0171\u0172\u0173", "uuuuuuuuuuuuuuuuuuuu"},
-        {"\u0174\u0175", "ww"},
-        {"\u00DD\u00FD\u00FF\u0176\u0177\u0178", "yyyyyy"},
-        {"\u0179\u017A\u017B\u017C\u017D\u017E", "zzzzzz"},
-        // Various forms of Unicode whitespace characters - NBSP, em space, en space, etc
-        {"a\u0009\nb\u000Bc\u000Cd\re\u0085f\u00A0g\u1680h\u2000i\u2001j\u2002k\u2003l\u2004m\u2005n\u2006o\u2007p\u2008q\u2009r\u200As\u2028t\u2029u\u202Fv\u205Fw\u3000z","a b c d e f g h i j k l m n o p q r s t u v w z"},
-        // Latin-1 Supplement
-        {//"€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ " + // These are all considered control characters
-         //"¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿" // punctuation
-         "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ",
-         "aaaaaaaeceeeeiiiidnooooooeuuuuythssaaaaaaaeceeeeiiiidnooooooeuuuuythy"},
-        // Latin Extended A
-        {"ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ",
-         "aaaaaaccccccccddddeeeeeeeeeegggggggghhhhiiiiiiiiiiijijjjkkkllllllllllnnnnnnnnnoooooooeoerrrrrrssssssssttttttuuuuuuuuuuuuwwyyyzzzzzzs"},
-        // Latin Extended B
-        // TODO: These don't get folded to ASCII equivalents. Not sure if they should be
+            { "æø", "aeoe" }, // Norwegian replacements from #650
+            { "©ß", "css" }, // issue #409 esszet
+            { "\u00D0\u00F0\u00DE\u00FEǷƿ", "ddththww" }, // eth, thorn, & wynn for Icelandic / Olde English
+            { "fffiflffiſtst", "fffiflffistst" }, // ligatures
+            // Test legacy replacements
+            { "\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u0100\u0101\u0102\u0103\u0104\u0105",
+                    "aaaaaaaaaaaaaaaaaa" },
+            { "\u00C7\u00E7\u0106\u0107\u0108\u0109\u010A\u010B\u010C\u010D", "cccccccccc" },
+            { "\u00D0\u00F0\u010E\u010F\u0110\u0111", "dddddd" },
+            { "\u00C8\u00C9\u00CA\u00CB\u00E8\u00E9\u00EA\u00EB\u0112\u0113\u0114\u0115\u0116\u0117\u0118\u0119\u011A\u011B",
+                    "eeeeeeeeeeeeeeeeee" },
+            { "\u011C\u011D\u011E\u011F\u0120\u0121\u0122\u0123", "gggggggg" },
+            { "\u0124\u0125", "hh" },
+            { "\u0126\u0127", "hh" },
+            { "\u00CC\u00CD\u00CE\u00CF\u00EC\u00ED\u00EE\u00EF\u0128\u0129\u012A\u012B\u012C\u012D\u012E\u012F\u0130",
+                    "iiiiiiiiiiiiiiiii" },
+            { "\u0131", "i" },
+            { "\u0134\u0135", "jj" },
+            { "\u0136\u0137", "kk" },
+            { "\u0138", "k" },
+            { "\u0139\u013A\u013B\u013C\u013D\u013E\u0141\u0142", "llllllll" },
+            { "\u013F\u0140", "ll" },
+            { "\u00D1\u00F1\u0143\u0144\u0145\u0146\u0147\u0148", "nnnnnnnn" },
+            { "\u0149", "n" }, // decomposed to 'n, but then punctuation is stripped
+            { "\u014A\u014B", "nn" },
+            { "\u00D2\u00D3\u00D4\u00D5\u00D6\u00F2\u00F3\u00F4\u00F5\u00F6\u014C\u014D\u014E\u014F\u0150\u0151", "oooooooooooooooo" },
+            { "\u00D8\u00F8", "oeoe" }, // O with stroke we decompose to oe instead of o
+            { "\u0154\u0155\u0156\u0157\u0158\u0159", "rrrrrr" },
+            { "\u015A\u015B\u015C\u015D\u015E\u015F\u0160\u0161\u017F", "sssssssss" },
+            { "\u0162\u0163\u0164\u0165\u0166\u0167", "tttttt" },
+            { "\u00D9\u00DA\u00DB\u00DC\u00F9\u00FA\u00FB\u00FC\u0168\u0169\u016A\u016B\u016C\u016D\u016E\u016F\u0170\u0171\u0172\u0173",
+                    "uuuuuuuuuuuuuuuuuuuu" },
+            { "\u0174\u0175", "ww" },
+            { "\u00DD\u00FD\u00FF\u0176\u0177\u0178", "yyyyyy" },
+            { "\u0179\u017A\u017B\u017C\u017D\u017E", "zzzzzz" },
+            // Various forms of Unicode whitespace characters - NBSP, em space, en space, etc
+            { "a\u0009\nb\u000Bc\u000Cd\re\u0085f\u00A0g\u1680h\u2000i\u2001j\u2002k\u2003l\u2004m\u2005n\u2006o\u2007p\u2008q\u2009r\u200As\u2028t\u2029u\u202Fv\u205Fw\u3000z",
+                    "a b c d e f g h i j k l m n o p q r s t u v w z" },
+            // Latin-1 Supplement
+            { // "€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—˜™š›œžŸ " + // These are all considered control characters
+              // "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿" // punctuation
+                    "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ",
+                    "aaaaaaaeceeeeiiiidnooooooeuuuuythssaaaaaaaeceeeeiiiidnooooooeuuuuythy" },
+            // Latin Extended A
+            { "ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſ",
+                    "aaaaaaccccccccddddeeeeeeeeeegggggggghhhhiiiiiiiiiiijijjjkkkllllllllllnnnnnnnnnoooooooeoerrrrrrssssssssttttttuuuuuuuuuuuuwwyyyzzzzzzs" },
+            // Latin Extended B
+            // TODO: These don't get folded to ASCII equivalents. Not sure if they should be
 //        {"ƄƅƉƊƋƌƔƕƖƗƘƙƚƛƜƝƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀǁǂǃDŽDždžLJLjljNJNjnjǍǎǏǐǑǒǓǔǕǖǗǘǙǚǛǜǝ",
 //         "bbddddhiikkllmnnooooopprssssttttuuuuyyzz                      aaiioouuuuuuuuuux"},
 //        {"ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴǵǶǷǸǹǺǻǼǽǾǿȀȁȂȃȄȅȆȇȈȉȊȋȌȍȎȏȐȑȒȓȔȕȖȗȘșȚțȜȝȞȟȠȡȢȣȤȥȦȧȨȩȪȫȬȭȮȯȰȱȲȳȴȵȶȷȸȹȺȻȼȽȾȿɀɁɂɃɄɅɆɇɈɉɊɋɌɍɎɏ",
 //         "aaaaaeaeggggkkqqqqqssjdzdzggpnnaaaeaeooaaaeeeeeiiiioooorrrruuuusstt    zzaaeeooooooooyy"},
-        // Latin Extended Additional
-        {"ḀḁḂḃḄḅḆḇḈḉḊḋḌḍḎḏḐḑḒḓḔḕḖḗḘḙḚḛḜḝḞḟḠḡḢḣḤḥḦḧḨḩḪḫḬḭḮḯḰḱḲḳḴḵḶḷḸḹḺḻḼḽḾḿṀṁṂṃṄṅṆṇṈṉṊṋṌṍṎṏṐṑṒṓṔṕṖṗ",
-         "aabbbbbbccddddddddddeeeeeeeeeeffgghhhhhhhhhhiiiikkkkkkllllllllmmmmmmnnnnnnnnoooooooopppp"},
-        {"ṘṙṚṛṜṝṞṟṠṡṢṣṤṥṦṧṨṩṪṫṬṭṮṯṰṱṲṳṴṵṶṷṸṹṺṻṼṽṾṿẀẁẂẃẄẅẆẇẈẉẊẋẌẍẎẏẐẑẒẓẔẕ",
-         "rrrrrrrrssssssssssttttttttuuuuuuuuuuvvvvwwwwwwwwwwxxxxyyzzzzzz"},
-        {"ẖẗẘẙẚẛẜẝẞẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặẸẹẺẻẼẽẾếỀềỂểỄễỆệ",
-         "htwyasssssaaaaaaaaaaaaaaaaaaaaaaaaeeeeeeeeeeeeeeee"},
-        // Latin Extended C - TODO: not supported yet
+            // Latin Extended Additional
+            { "ḀḁḂḃḄḅḆḇḈḉḊḋḌḍḎḏḐḑḒḓḔḕḖḗḘḙḚḛḜḝḞḟḠḡḢḣḤḥḦḧḨḩḪḫḬḭḮḯḰḱḲḳḴḵḶḷḸḹḺḻḼḽḾḿṀṁṂṃṄṅṆṇṈṉṊṋṌṍṎṏṐṑṒṓṔṕṖṗ",
+                    "aabbbbbbccddddddddddeeeeeeeeeeffgghhhhhhhhhhiiiikkkkkkllllllllmmmmmmnnnnnnnnoooooooopppp" },
+            { "ṘṙṚṛṜṝṞṟṠṡṢṣṤṥṦṧṨṩṪṫṬṭṮṯṰṱṲṳṴṵṶṷṸṹṺṻṼṽṾṿẀẁẂẃẄẅẆẇẈẉẊẋẌẍẎẏẐẑẒẓẔẕ",
+                    "rrrrrrrrssssssssssttttttttuuuuuuuuuuvvvvwwwwwwwwwwxxxxyyzzzzzz" },
+            { "ẖẗẘẙẚẛẜẝẞẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặẸẹẺẻẼẽẾếỀềỂểỄễỆệ",
+                    "htwyasssssaaaaaaaaaaaaaaaaaaaaaaaaeeeeeeeeeeeeeeee" },
+            // Latin Extended C - TODO: not supported yet
 //        {"ⱠⱡⱢⱣⱤⱥⱦⱧⱨⱩⱪⱫⱬⱭⱮⱯⱰⱱⱲⱳⱴⱵⱶⱷⱸⱹⱺⱻⱼⱽⱾⱿ",
 //         "lllprathhkkzzamaaavwwwv   e ejvsz"},
-        // Latin Extended D
-        {"", ""},
-        // Latin Extended E
-        {"", ""},
-        // TODO: Add tests for non-Western languages
-        {"", ""},
+            // Latin Extended D
+            { "", "" },
+            // Latin Extended E
+            { "", "" },
+            // TODO: Add tests for non-Western languages
+            { "", "" },
     };
 
     private static final String[][] testNGramStrings = {
-        {"abcdefg","abbccddeeffg"},
-        {"gfedcba","bacbdcedfegf"},
-        {"a b c d e f g","abbccddeeffg"},
-        {" a,b.c d\te!f?g ","abbccddeeffg"},
-        {"écÉCec","ceec"},
-        // All the whitespace characters below should be skipped
-        {"a\u0009\nb\u000Bc\u000Cd\re\u0085f\u00A0g\u1680h\u2000i\u2001j\u2002k\u2003l\u2004m\u2005n\u2006o\u2007p\u2008q\u2009r\u200As\u2028t\u2029u\u202Fv\u205Fw\u3000z","abbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwz"},
-        {"",""}, //TODO: add more test cases
-        {"",""},
+            { "abcdefg", "abbccddeeffg" },
+            { "gfedcba", "bacbdcedfegf" },
+            { "a b c d e f g", "abbccddeeffg" },
+            { " a,b.c d\te!f?g ", "abbccddeeffg" },
+            { "écÉCec", "ceec" },
+            // All the whitespace characters below should be skipped
+            { "a\u0009\nb\u000Bc\u000Cd\re\u0085f\u00A0g\u1680h\u2000i\u2001j\u2002k\u2003l\u2004m\u2005n\u2006o\u2007p\u2008q\u2009r\u200As\u2028t\u2029u\u202Fv\u205Fw\u3000z",
+                    "abbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwz" },
+            { "", "" }, // TODO: add more test cases
+            { "", "" },
     };
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @BeforeMethod
     public void SetUp() {
-         keyer = new FingerprintKeyer();
+        keyer = new FingerprintKeyer();
     }
 
     @AfterMethod
     public void TearDown() {
         keyer = null;
     }
-    
-    @Test(expectedExceptions=IllegalArgumentException.class)
-    public void testInvalidParams() {        
-        keyer.key("test",(Object[])new String[]{"foo"});
+
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testInvalidParams() {
+        keyer.key("test", (Object[]) new String[] { "foo" });
     }
-    
+
     @Test
     public void testFingerprintKeyer() {
         for (String[] ss : testStrings) {
-            Assert.assertEquals(ss.length,2,"Invalid test"); // Not a valid test
-            Assert.assertEquals(keyer.key(ss[0]),ss[1],
+            Assert.assertEquals(ss.length, 2, "Invalid test"); // Not a valid test
+            Assert.assertEquals(keyer.key(ss[0]), ss[1],
                     "Fingerprint for string: " + ss[0] + " failed");
         }
     }
-    
+
     @Test
-    public void testNGramKeyer() {    
+    public void testNGramKeyer() {
         keyer = new NGramFingerprintKeyer();
         for (String[] ss : testNGramStrings) {
-            Assert.assertEquals(ss.length,2,"Invalid test"); // Not a valid test
-            Assert.assertEquals(keyer.key(ss[0]),ss[1],
+            Assert.assertEquals(ss.length, 2, "Invalid test"); // Not a valid test
+            Assert.assertEquals(keyer.key(ss[0]), ss[1],
                     "Fingerprint for string: " + ss[0] + " failed");
         }
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java b/OpenRefine/main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java
index 6bf6f9375..2b24d99ab 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/clustering/knn/kNNClustererTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.clustering.knn;
 
 import static org.testng.Assert.assertTrue;
@@ -43,7 +44,7 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class kNNClustererTests extends RefineTest {
-    
+
     public static String configJson = "{"
             + "\"type\":\"knn\","
             + "\"function\":\"PPM\","
@@ -53,13 +54,13 @@ public class kNNClustererTests extends RefineTest {
     public static String clustererJson = "["
             + "   [{\"v\":\"ab\",\"c\":1},{\"v\":\"abc\",\"c\":1}]"
             + "]";
-    
+
     @Test
     public void serializekNNClustererConfig() throws JsonParseException, JsonMappingException, IOException {
         kNNClustererConfig config = ParsingUtilities.mapper.readValue(configJson, kNNClustererConfig.class);
         TestUtils.isSerializedTo(config, configJson);
     }
-    
+
     @Test
     public void serializekNNClusterer() throws JsonParseException, JsonMappingException, IOException {
         Project project = createCSVProject("column\n"
@@ -67,23 +68,23 @@ public class kNNClustererTests extends RefineTest {
                 + "abc\n"
                 + "c\n"
                 + "ĉ\n");
-        
+
         kNNClustererConfig config = ParsingUtilities.mapper.readValue(configJson, kNNClustererConfig.class);
         kNNClusterer clusterer = config.apply(project);
         clusterer.computeClusters(new Engine(project));
-        
+
         TestUtils.isSerializedTo(clusterer, clustererJson);
     }
-    
+
     @Test
     public void testNoLonelyclusters() throws JsonParseException, JsonMappingException, IOException {
-    	Project project = createCSVProject("column\n"
+        Project project = createCSVProject("column\n"
                 + "foo\n"
                 + "bar\n");
-    	kNNClustererConfig config = ParsingUtilities.mapper.readValue(configJson, kNNClustererConfig.class);
-    	kNNClusterer clusterer = config.apply(project);
-    	clusterer.computeClusters(new Engine(project));
-    	
-    	assertTrue(clusterer.getJsonRepresentation().isEmpty());
+        kNNClustererConfig config = ParsingUtilities.mapper.readValue(configJson, kNNClustererConfig.class);
+        kNNClusterer clusterer = config.apply(project);
+        clusterer.computeClusters(new Engine(project));
+
+        assertTrue(clusterer.getJsonRepresentation().isEmpty());
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/CSRFTokenFactoryTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/CSRFTokenFactoryTests.java
index f966e971b..0068a03ed 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/CSRFTokenFactoryTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/CSRFTokenFactoryTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands;
 
 import static org.testng.Assert.assertEquals;
@@ -9,41 +10,43 @@ import java.time.Instant;
 import org.testng.annotations.Test;
 
 public class CSRFTokenFactoryTests {
-	
-	static class CSRFTokenFactoryStub extends CSRFTokenFactory{
-		public CSRFTokenFactoryStub(long timeToLive, int tokenLength) {
-			super(timeToLive, tokenLength);
-		}
-		public void tamperWithToken(String token, Instant newGenerationTime) {
-			tokenCache.asMap().put(token, newGenerationTime);
-		}
-	}
-	
-	@Test
-	public void testGenerateValidToken() {
-		CSRFTokenFactory factory = new CSRFTokenFactory(10, 25);
-		// Generate a fresh token
-		String token = factory.getFreshToken();
-		// Immediately after, the token is still valid
-		assertTrue(factory.validToken(token));
-		// The token has the right length
-		assertEquals(25, token.length());
-	}
-	
-	@Test
-	public void testInvalidToken() {
-		CSRFTokenFactory factory = new CSRFTokenFactory(10, 25);
-		assertFalse(factory.validToken("bogusToken"));
-	}
-	
-	@Test
-	public void testOldToken() {
-		CSRFTokenFactoryStub stub = new CSRFTokenFactoryStub(10, 25);
-		// Generate a fresh token
-		String token = stub.getFreshToken();
-		// Manually change the generation time
-		stub.tamperWithToken(token, Instant.now().minusSeconds(100));
-		// The token should now be invalid
-		assertFalse(stub.validToken(token));
-	}
+
+    static class CSRFTokenFactoryStub extends CSRFTokenFactory {
+
+        public CSRFTokenFactoryStub(long timeToLive, int tokenLength) {
+            super(timeToLive, tokenLength);
+        }
+
+        public void tamperWithToken(String token, Instant newGenerationTime) {
+            tokenCache.asMap().put(token, newGenerationTime);
+        }
+    }
+
+    @Test
+    public void testGenerateValidToken() {
+        CSRFTokenFactory factory = new CSRFTokenFactory(10, 25);
+        // Generate a fresh token
+        String token = factory.getFreshToken();
+        // Immediately after, the token is still valid
+        assertTrue(factory.validToken(token));
+        // The token has the right length
+        assertEquals(25, token.length());
+    }
+
+    @Test
+    public void testInvalidToken() {
+        CSRFTokenFactory factory = new CSRFTokenFactory(10, 25);
+        assertFalse(factory.validToken("bogusToken"));
+    }
+
+    @Test
+    public void testOldToken() {
+        CSRFTokenFactoryStub stub = new CSRFTokenFactoryStub(10, 25);
+        // Generate a fresh token
+        String token = stub.getFreshToken();
+        // Manually change the generation time
+        stub.tamperWithToken(token, Instant.now().minusSeconds(100));
+        // The token should now be invalid
+        assertFalse(stub.validToken(token));
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandStub.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandStub.java
index 2a7818458..847fc76b7 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandStub.java
@@ -46,21 +46,20 @@ import com.google.refine.model.Project;
 public class CommandStub extends Command {
 
     public Project wrapGetProject(HttpServletRequest request)
-    throws ServletException {
+            throws ServletException {
         return getProject(request);
     }
 
-    public EngineConfig wrapGetEngineConfig(HttpServletRequest request)
-    {
+    public EngineConfig wrapGetEngineConfig(HttpServletRequest request) {
         return getEngineConfig(request);
     }
 
     public Engine wrapGetEngine(HttpServletRequest request, Project project)
-    throws Exception {
+            throws Exception {
         return getEngine(request, project);
     }
 
-    public int wrapGetIntegerParameter(HttpServletRequest request, String name,int def) {
+    public int wrapGetIntegerParameter(HttpServletRequest request, String name, int def) {
         return getIntegerParameter(request, name, def);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTestBase.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTestBase.java
index 5d81f12de..7c90339c1 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTestBase.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTestBase.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands;
 
 import static org.mockito.Mockito.mock;
@@ -15,27 +16,28 @@ import org.testng.annotations.BeforeMethod;
 import com.google.refine.util.TestUtils;
 
 public class CommandTestBase {
-	protected HttpServletRequest request = null;
+
+    protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
     protected Command command = null;
     protected StringWriter writer = null;
-    
-	@BeforeMethod
-	public void setUpRequestResponse() {
-		request = mock(HttpServletRequest.class);
-		response = mock(HttpServletResponse.class);
-		writer = new StringWriter();
-		try {
+
+    @BeforeMethod
+    public void setUpRequestResponse() {
+        request = mock(HttpServletRequest.class);
+        response = mock(HttpServletResponse.class);
+        writer = new StringWriter();
+        try {
             when(response.getWriter()).thenReturn(new PrintWriter(writer));
         } catch (IOException e) {
             e.printStackTrace();
         }
-	}
-	
-	/** 
-	 * Convenience method to check that CSRF protection was triggered
-	 */
-	protected void assertCSRFCheckFailed() {
-		TestUtils.assertEqualsAsJson(writer.toString(), "{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}");
-	}
+    }
+
+    /**
+     * Convenience method to check that CSRF protection was triggered
+     */
+    protected void assertCSRFCheckFailed() {
+        TestUtils.assertEqualsAsJson(writer.toString(), "{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}");
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTests.java
index 9e6b825a0..9d1f0794d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/CommandTests.java
@@ -62,7 +62,7 @@ public class CommandTests extends RefineTest {
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     CommandStub SUT = null;
     HttpServletRequest request = null;
     ProjectManager projectManager = null;
@@ -138,7 +138,7 @@ public class CommandTests extends RefineTest {
     public void getEngineConfigReturnsNullWithEmptyOrBadParameterValue() {
         when(request.getParameter("engine")).thenReturn("sdfasdfas");
 
-        Assert.assertNull( SUT.wrapGetEngineConfig(request) );
+        Assert.assertNull(SUT.wrapGetEngineConfig(request));
 
         verify(request, times(1)).getParameter("engine");
     }
@@ -259,7 +259,7 @@ public class CommandTests extends RefineTest {
 
         // positive
         try {
-            int returned = SUT.wrapGetIntegerParameter(request,"positivenumber", 5);
+            int returned = SUT.wrapGetIntegerParameter(request, "positivenumber", 5);
             Assert.assertEquals(22, returned);
         } catch (IllegalArgumentException e) {
             Assert.fail();
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/EngineDependentCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/EngineDependentCommandTests.java
index 923613aa3..5ec5c1a7e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/EngineDependentCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/EngineDependentCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands;
 
 import java.io.IOException;
@@ -13,26 +14,25 @@ import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
 
 public class EngineDependentCommandTests extends CommandTestBase {
-	
-	private static class EngineDependentCommandStub extends EngineDependentCommand {
 
-		@Override
-		protected AbstractOperation createOperation(Project project, HttpServletRequest request,
-				EngineConfig engineConfig) throws Exception {
-			return null;
-		}
-		
-	}
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new EngineDependentCommandStub();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+    private static class EngineDependentCommandStub extends EngineDependentCommand {
+
+        @Override
+        protected AbstractOperation createOperation(Project project, HttpServletRequest request,
+                EngineConfig engineConfig) throws Exception {
+            return null;
+        }
+
+    }
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new EngineDependentCommandStub();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/GetCSRFTokenCommandTest.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/GetCSRFTokenCommandTest.java
index 6133a2e91..7dc26a434 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/GetCSRFTokenCommandTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/GetCSRFTokenCommandTest.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands;
 
 import static org.mockito.Mockito.mock;
@@ -21,11 +22,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.util.ParsingUtilities;
 
 public class GetCSRFTokenCommandTest {
+
     protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
-	protected StringWriter writer = null;
-	protected Command command = null;
-	
+    protected StringWriter writer = null;
+    protected Command command = null;
+
     @BeforeMethod
     public void setUp() {
         request = mock(HttpServletRequest.class);
@@ -38,12 +40,12 @@ public class GetCSRFTokenCommandTest {
             e.printStackTrace();
         }
     }
-    
+
     @Test
     public void testGetToken() throws JsonParseException, JsonMappingException, IOException, ServletException {
-    	command.doGet(request, response);
-    	ObjectNode result = ParsingUtilities.mapper.readValue(writer.toString(), ObjectNode.class);
-    	String token = result.get("token").asText();
-    	assertTrue(Command.csrfFactory.validToken(token));
+        command.doGet(request, response);
+        ObjectNode result = ParsingUtilities.mapper.readValue(writer.toString(), ObjectNode.class);
+        String token = result.get("token").asText();
+        assertTrue(Command.csrfFactory.validToken(token));
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/OpenWorkspaceDirCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/OpenWorkspaceDirCommandTests.java
index 46d2cb8a6..31039228e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/OpenWorkspaceDirCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/OpenWorkspaceDirCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands;
 
 import java.io.IOException;
@@ -8,16 +9,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class OpenWorkspaceDirCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new OpenWorkspaceDirCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new OpenWorkspaceDirCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/SetPreferenceCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/SetPreferenceCommandTests.java
index 25dec760e..542db0234 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/SetPreferenceCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/SetPreferenceCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands;
 
 import java.io.IOException;
@@ -8,16 +9,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class SetPreferenceCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new SetPreferenceCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new SetPreferenceCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java
index bb4327e6f..b93aefb0d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/GetClusteringFunctionsAndDistancesCommandTest.java
@@ -48,14 +48,13 @@ import com.google.refine.commands.Command;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 
-
 public class GetClusteringFunctionsAndDistancesCommandTest {
-	
+
     protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
-	protected StringWriter writer = null;
-	protected Command command = null;
-	
+    protected StringWriter writer = null;
+    protected Command command = null;
+
     @BeforeMethod
     public void setUp() {
         request = mock(HttpServletRequest.class);
@@ -68,12 +67,12 @@ public class GetClusteringFunctionsAndDistancesCommandTest {
             e.printStackTrace();
         }
     }
-	
+
     @Test
-	public void testGetFunctionsAndKeyers() throws ServletException, IOException {
-    	command.doGet(request, response);
-    	ObjectNode result = ParsingUtilities.mapper.readValue(writer.toString(), ObjectNode.class);
-    	assertTrue(Arrays.asList(JSONUtilities.getStringArray(result, "keyers")).contains("metaphone3"));
-    	assertTrue(Arrays.asList(JSONUtilities.getStringArray(result, "distances")).contains("levenshtein"));
-	}
+    public void testGetFunctionsAndKeyers() throws ServletException, IOException {
+        command.doGet(request, response);
+        ObjectNode result = ParsingUtilities.mapper.readValue(writer.toString(), ObjectNode.class);
+        assertTrue(Arrays.asList(JSONUtilities.getStringArray(result, "keyers")).contains("metaphone3"));
+        assertTrue(Arrays.asList(JSONUtilities.getStringArray(result, "distances")).contains("levenshtein"));
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/ScatterplotDrawCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/ScatterplotDrawCommandTests.java
index b3c65edd4..a9b197a8d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/ScatterplotDrawCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/browsing/ScatterplotDrawCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.browsing;
 
 import static org.mockito.Mockito.mock;
@@ -21,11 +22,12 @@ import com.google.refine.commands.Command;
 import com.google.refine.util.ParsingUtilities;
 
 public class ScatterplotDrawCommandTests {
+
     protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
-	protected StringWriter writer = null;
-	protected Command command = null;
-	
+    protected StringWriter writer = null;
+    protected Command command = null;
+
     @BeforeMethod
     public void setUp() {
         request = mock(HttpServletRequest.class);
@@ -38,105 +40,108 @@ public class ScatterplotDrawCommandTests {
             e.printStackTrace();
         }
     }
-    
+
     public static String configJson = "{"
-    		+ "\"name\":\"a (x) vs. b (y)\","
-    		+ "\"cx\":\"a\","
-    		+ "\"cy\":\"b\","
-    		+ "\"l\":150,"
-    		+ "\"ex\":\"value\","
-    		+ "\"ey\":\"value\","
-    		+ "\"dot\":0.8,"
-    		+ "\"dim_x\":\"log\","
-    		+ "\"dim_y\":\"lin\","
-    		+ "\"type\":\"scatterplot\","
-    		+ "\"from_x\":1,"
-    		+ "\"to_x\":2,"
-    		+ "\"from_y\":3,"
-    		+ "\"to_y\":4,"
-    		+ "\"color\":\"ff6a00\""
-    		+ "}";
-    
-    
+            + "\"name\":\"a (x) vs. b (y)\","
+            + "\"cx\":\"a\","
+            + "\"cy\":\"b\","
+            + "\"l\":150,"
+            + "\"ex\":\"value\","
+            + "\"ey\":\"value\","
+            + "\"dot\":0.8,"
+            + "\"dim_x\":\"log\","
+            + "\"dim_y\":\"lin\","
+            + "\"type\":\"scatterplot\","
+            + "\"from_x\":1,"
+            + "\"to_x\":2,"
+            + "\"from_y\":3,"
+            + "\"to_y\":4,"
+            + "\"color\":\"ff6a00\""
+            + "}";
+
     public static String configJsonWithNone = "{"
-    		+ "\"name\":\"b (x) vs. y (y)\","
-    		+ "\"cx\":\"b\","
-    		+ "\"cy\":\"y\","
-    		+ "\"l\":150,"
-    		+ "\"ex\":\"value\","
-    		+ "\"ey\":\"value\","
-    		+ "\"dot\":1.4,"
-    		+ "\"dim_x\":\"lin\","
-    		+ "\"dim_y\":\"lin\","
-    		+ "\"r\":\"none\","
-    		+ "\"type\":\"scatterplot\","
-    		+ "\"from_x\":0,"
-    		+ "\"to_x\":0,"
-    		+ "\"from_y\":0,"
-    		+ "\"to_y\":0,"
-    		+ "\"color\":\"ff6a00\"}";
+            + "\"name\":\"b (x) vs. y (y)\","
+            + "\"cx\":\"b\","
+            + "\"cy\":\"y\","
+            + "\"l\":150,"
+            + "\"ex\":\"value\","
+            + "\"ey\":\"value\","
+            + "\"dot\":1.4,"
+            + "\"dim_x\":\"lin\","
+            + "\"dim_y\":\"lin\","
+            + "\"r\":\"none\","
+            + "\"type\":\"scatterplot\","
+            + "\"from_x\":0,"
+            + "\"to_x\":0,"
+            + "\"from_y\":0,"
+            + "\"to_y\":0,"
+            + "\"color\":\"ff6a00\"}";
 
-	public static String configJsonWithCW = "{"
-			+ "\"name\":\"b (x) vs. y (y)\","
-			+ "\"cx\":\"b\","
-			+ "\"cy\":\"y\","
-			+ "\"l\":150,"
-			+ "\"ex\":\"value\","
-			+ "\"ey\":\"value\","
-			+ "\"dot\":1.4,"
-			+ "\"dim_x\":\"lin\","
-			+ "\"dim_y\":\"lin\","
-			+ "\"r\":\"cw\","
-			+ "\"type\":\"scatterplot\","
-			+ "\"from_x\":0,"
-			+ "\"to_x\":0,"
-			+ "\"from_y\":0,"
-			+ "\"to_y\":0,"
-			+ "\"color\":\"ff6a00\"}";
+    public static String configJsonWithCW = "{"
+            + "\"name\":\"b (x) vs. y (y)\","
+            + "\"cx\":\"b\","
+            + "\"cy\":\"y\","
+            + "\"l\":150,"
+            + "\"ex\":\"value\","
+            + "\"ey\":\"value\","
+            + "\"dot\":1.4,"
+            + "\"dim_x\":\"lin\","
+            + "\"dim_y\":\"lin\","
+            + "\"r\":\"cw\","
+            + "\"type\":\"scatterplot\","
+            + "\"from_x\":0,"
+            + "\"to_x\":0,"
+            + "\"from_y\":0,"
+            + "\"to_y\":0,"
+            + "\"color\":\"ff6a00\"}";
+
+    public static String configJsonWithCCW = "{"
+            + "\"name\":\"b (x) vs. y (y)\","
+            + "\"cx\":\"b\","
+            + "\"cy\":\"y\","
+            + "\"l\":150,"
+            + "\"ex\":\"value\","
+            + "\"ey\":\"value\","
+            + "\"dot\":1.4,"
+            + "\"dim_x\":\"lin\","
+            + "\"dim_y\":\"lin\","
+            + "\"r\":\"ccw\","
+            + "\"type\":\"scatterplot\","
+            + "\"from_x\":0,"
+            + "\"to_x\":0,"
+            + "\"from_y\":0,"
+            + "\"to_y\":0,"
+            + "\"color\":\"ff6a00\"}";
 
-	public static String configJsonWithCCW = "{"
-			+ "\"name\":\"b (x) vs. y (y)\","
-			+ "\"cx\":\"b\","
-			+ "\"cy\":\"y\","
-			+ "\"l\":150,"
-			+ "\"ex\":\"value\","
-			+ "\"ey\":\"value\","
-			+ "\"dot\":1.4,"
-			+ "\"dim_x\":\"lin\","
-			+ "\"dim_y\":\"lin\","
-			+ "\"r\":\"ccw\","
-			+ "\"type\":\"scatterplot\","
-			+ "\"from_x\":0,"
-			+ "\"to_x\":0,"
-			+ "\"from_y\":0,"
-			+ "\"to_y\":0,"
-			+ "\"color\":\"ff6a00\"}";
-    
     @Test
     public void testParseConfig() throws JsonParseException, JsonMappingException, IOException {
-    	GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJson, GetScatterplotCommand.PlotterConfig.class);
-    	Assert.assertEquals("a", config.columnName_x);
-    	Assert.assertEquals("b", config.columnName_y);
-    	Assert.assertEquals(ScatterplotFacet.LOG, config.dim_x);
-    	Assert.assertEquals(ScatterplotFacet.LIN, config.dim_y);
+        GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJson,
+                GetScatterplotCommand.PlotterConfig.class);
+        Assert.assertEquals("a", config.columnName_x);
+        Assert.assertEquals("b", config.columnName_y);
+        Assert.assertEquals(ScatterplotFacet.LOG, config.dim_x);
+        Assert.assertEquals(ScatterplotFacet.LIN, config.dim_y);
     }
-    
+
     @Test
     public void testParseConfigWithNone() throws JsonParseException, JsonMappingException, IOException {
-    	GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJsonWithNone, GetScatterplotCommand.PlotterConfig.class);
-    	Assert.assertEquals(ScatterplotFacet.NO_ROTATION, config.rotation);
+        GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJsonWithNone,
+                GetScatterplotCommand.PlotterConfig.class);
+        Assert.assertEquals(ScatterplotFacet.NO_ROTATION, config.rotation);
     }
 
-	@Test
-	public void testParseConfigWithCW() throws JsonParseException, JsonMappingException, IOException {
-		GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJsonWithCW, GetScatterplotCommand.PlotterConfig.class);
-		Assert.assertEquals(ScatterplotFacet.ROTATE_CW, config.rotation);
-	}
+    @Test
+    public void testParseConfigWithCW() throws JsonParseException, JsonMappingException, IOException {
+        GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJsonWithCW,
+                GetScatterplotCommand.PlotterConfig.class);
+        Assert.assertEquals(ScatterplotFacet.ROTATE_CW, config.rotation);
+    }
+
+    @Test
+    public void testParseConfigWithCCW() throws JsonParseException, JsonMappingException, IOException {
+        GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJsonWithCCW,
+                GetScatterplotCommand.PlotterConfig.class);
+        Assert.assertEquals(ScatterplotFacet.ROTATE_CCW, config.rotation);
+    }
 
-	@Test
-	public void testParseConfigWithCCW() throws JsonParseException, JsonMappingException, IOException {
-		GetScatterplotCommand.PlotterConfig config = ParsingUtilities.mapper.readValue(configJsonWithCCW, GetScatterplotCommand.PlotterConfig.class);
-		Assert.assertEquals(ScatterplotFacet.ROTATE_CCW, config.rotation);
-	}
-	
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/EditOneCellCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/EditOneCellCommandTests.java
index 264466a42..ec6b55b8a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/EditOneCellCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/EditOneCellCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.cell;
 
 import static org.mockito.Mockito.mock;
@@ -23,95 +24,95 @@ import com.google.refine.util.TestUtils;
 
 public class EditOneCellCommandTests extends RefineTest {
 
-	private static final String PARSABLE_DOUBLE_NUMBER = "12345.123";
-	private static final String PARSABLE_LONG_NUMBER = "12345";
-	protected Project project = null;
-	protected HttpServletRequest request = null;
+    private static final String PARSABLE_DOUBLE_NUMBER = "12345.123";
+    private static final String PARSABLE_LONG_NUMBER = "12345";
+    protected Project project = null;
+    protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
     protected Command command = null;
     protected StringWriter writer = null;
-	
-	@BeforeMethod
-	public void setUpProject() {
-		project = createCSVProject(
-				"first_column,second_column\n"
-				+ "a,b\n"
-				+ "c,d\n");
-		command = new EditOneCellCommand();
-		request = mock(HttpServletRequest.class);
-		response = mock(HttpServletResponse.class);
-		writer = new StringWriter();
-		try {
+
+    @BeforeMethod
+    public void setUpProject() {
+        project = createCSVProject(
+                "first_column,second_column\n"
+                        + "a,b\n"
+                        + "c,d\n");
+        command = new EditOneCellCommand();
+        request = mock(HttpServletRequest.class);
+        response = mock(HttpServletResponse.class);
+        writer = new StringWriter();
+        try {
             when(response.getWriter()).thenReturn(new PrintWriter(writer));
         } catch (IOException e) {
             e.printStackTrace();
         }
-	}
-	
-	@Test
-	public void testEditOneCell() throws ServletException, IOException {
-		when(request.getParameter("project")).thenReturn(Long.toString(project.id));
-		when(request.getParameter("row")).thenReturn("1");
-		when(request.getParameter("cell")).thenReturn("0");
-		when(request.getParameter("type")).thenReturn("string");
-		when(request.getParameter("value")).thenReturn("e");
-		when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-		
-		command.doPost(request, response);
-		
-		assertEquals(project.rows.get(0).cells.get(0).value, "a");
-		assertEquals(project.rows.get(0).cells.get(1).value, "b");
-		assertEquals(project.rows.get(1).cells.get(0).value, "e");
-		assertEquals(project.rows.get(1).cells.get(1).value, "d");
-	}
-	
-	@Test
-	public void testNumberParsing_parsableLong() throws ServletException, IOException {
-		when(request.getParameter("project")).thenReturn(Long.toString(project.id));
-		when(request.getParameter("row")).thenReturn("1");
-		when(request.getParameter("cell")).thenReturn("0");
-		when(request.getParameter("type")).thenReturn("number");
-		when(request.getParameter("value")).thenReturn(PARSABLE_LONG_NUMBER);
-		when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+    }
 
-		command.doPost(request, response);
+    @Test
+    public void testEditOneCell() throws ServletException, IOException {
+        when(request.getParameter("project")).thenReturn(Long.toString(project.id));
+        when(request.getParameter("row")).thenReturn("1");
+        when(request.getParameter("cell")).thenReturn("0");
+        when(request.getParameter("type")).thenReturn("string");
+        when(request.getParameter("value")).thenReturn("e");
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
 
-		assertEquals(project.rows.get(0).cells.get(0).value, "a");
-		assertEquals(project.rows.get(0).cells.get(1).value, "b");
-		assertTrue(project.rows.get(1).cells.get(0).value instanceof Long);
-		assertEquals(new Long(12345), project.rows.get(1).cells.get(0).value);
-		assertEquals(project.rows.get(1).cells.get(1).value, "d");
-	}
+        command.doPost(request, response);
 
-	@Test
-	public void testNumberParsing_parsableDouble() throws ServletException, IOException {
-		when(request.getParameter("project")).thenReturn(Long.toString(project.id));
-		when(request.getParameter("row")).thenReturn("1");
-		when(request.getParameter("cell")).thenReturn("0");
-		when(request.getParameter("type")).thenReturn("number");
-		when(request.getParameter("value")).thenReturn(PARSABLE_DOUBLE_NUMBER);
-		when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+        assertEquals(project.rows.get(0).cells.get(0).value, "a");
+        assertEquals(project.rows.get(0).cells.get(1).value, "b");
+        assertEquals(project.rows.get(1).cells.get(0).value, "e");
+        assertEquals(project.rows.get(1).cells.get(1).value, "d");
+    }
 
-		command.doPost(request, response);
+    @Test
+    public void testNumberParsing_parsableLong() throws ServletException, IOException {
+        when(request.getParameter("project")).thenReturn(Long.toString(project.id));
+        when(request.getParameter("row")).thenReturn("1");
+        when(request.getParameter("cell")).thenReturn("0");
+        when(request.getParameter("type")).thenReturn("number");
+        when(request.getParameter("value")).thenReturn(PARSABLE_LONG_NUMBER);
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
 
-		assertEquals(project.rows.get(0).cells.get(0).value, "a");
-		assertEquals(project.rows.get(0).cells.get(1).value, "b");
-		assertTrue(project.rows.get(1).cells.get(0).value instanceof Double);
-		assertEquals(project.rows.get(1).cells.get(0).value, 12345.123);
-		assertEquals(project.rows.get(1).cells.get(1).value, "d");
-	}
-	
-	@Test
-	public void testMissingCSRFToken() throws ServletException, IOException {
-		when(request.getParameter("project")).thenReturn(Long.toString(project.id));
-		when(request.getParameter("row")).thenReturn("1");
-		when(request.getParameter("cell")).thenReturn("0");
-		when(request.getParameter("type")).thenReturn("string");
-		when(request.getParameter("value")).thenReturn("e");
-		
-		command.doPost(request, response);
-		
-		assertEquals(project.rows.get(1).cells.get(0).value, "c");
-		TestUtils.assertEqualAsJson("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", writer.toString());
-	}
+        command.doPost(request, response);
+
+        assertEquals(project.rows.get(0).cells.get(0).value, "a");
+        assertEquals(project.rows.get(0).cells.get(1).value, "b");
+        assertTrue(project.rows.get(1).cells.get(0).value instanceof Long);
+        assertEquals(new Long(12345), project.rows.get(1).cells.get(0).value);
+        assertEquals(project.rows.get(1).cells.get(1).value, "d");
+    }
+
+    @Test
+    public void testNumberParsing_parsableDouble() throws ServletException, IOException {
+        when(request.getParameter("project")).thenReturn(Long.toString(project.id));
+        when(request.getParameter("row")).thenReturn("1");
+        when(request.getParameter("cell")).thenReturn("0");
+        when(request.getParameter("type")).thenReturn("number");
+        when(request.getParameter("value")).thenReturn(PARSABLE_DOUBLE_NUMBER);
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+
+        command.doPost(request, response);
+
+        assertEquals(project.rows.get(0).cells.get(0).value, "a");
+        assertEquals(project.rows.get(0).cells.get(1).value, "b");
+        assertTrue(project.rows.get(1).cells.get(0).value instanceof Double);
+        assertEquals(project.rows.get(1).cells.get(0).value, 12345.123);
+        assertEquals(project.rows.get(1).cells.get(1).value, "d");
+    }
+
+    @Test
+    public void testMissingCSRFToken() throws ServletException, IOException {
+        when(request.getParameter("project")).thenReturn(Long.toString(project.id));
+        when(request.getParameter("row")).thenReturn("1");
+        when(request.getParameter("cell")).thenReturn("0");
+        when(request.getParameter("type")).thenReturn("string");
+        when(request.getParameter("value")).thenReturn("e");
+
+        command.doPost(request, response);
+
+        assertEquals(project.rows.get(1).cells.get(0).value, "c");
+        TestUtils.assertEqualAsJson("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", writer.toString());
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/JoinMultiValueCellsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/JoinMultiValueCellsCommandTests.java
index b837e2760..c6c5a2aa6 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/JoinMultiValueCellsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/JoinMultiValueCellsCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.cell;
 
 import java.io.IOException;
@@ -10,15 +11,15 @@ import org.testng.annotations.Test;
 import com.google.refine.commands.CommandTestBase;
 
 public class JoinMultiValueCellsCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new JoinMultiValueCellsCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new JoinMultiValueCellsCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/KeyValueColumnizeCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/KeyValueColumnizeCommandTests.java
index efb533700..2c68ce193 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/KeyValueColumnizeCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/KeyValueColumnizeCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.cell;
 
 import java.io.IOException;
@@ -10,15 +11,15 @@ import org.testng.annotations.Test;
 import com.google.refine.commands.CommandTestBase;
 
 public class KeyValueColumnizeCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new KeyValueColumnizeCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new KeyValueColumnizeCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/SplitMultiValueCellsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/SplitMultiValueCellsCommandTests.java
index ed3adbc54..a32f7128e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/SplitMultiValueCellsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/SplitMultiValueCellsCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.cell;
 
 import java.io.IOException;
@@ -10,14 +11,15 @@ import org.testng.annotations.Test;
 import com.google.refine.commands.CommandTestBase;
 
 public class SplitMultiValueCellsCommandTests extends CommandTestBase {
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new SplitMultiValueCellsCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new SplitMultiValueCellsCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeColumnsIntoRowsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeColumnsIntoRowsCommandTests.java
index c6562c624..22a609a99 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeColumnsIntoRowsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeColumnsIntoRowsCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.cell;
 
 import java.io.IOException;
@@ -10,14 +11,15 @@ import org.testng.annotations.Test;
 import com.google.refine.commands.CommandTestBase;
 
 public class TransposeColumnsIntoRowsCommandTests extends CommandTestBase {
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new TransposeColumnsIntoRowsCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new TransposeColumnsIntoRowsCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeRowsIntoColumnsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeRowsIntoColumnsCommandTests.java
index 105b1be31..2787ea351 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeRowsIntoColumnsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/cell/TransposeRowsIntoColumnsCommandTests.java
@@ -1,4 +1,6 @@
+
 package com.google.refine.commands.cell;
+
 import java.io.IOException;
 
 import javax.servlet.ServletException;
@@ -9,14 +11,15 @@ import org.testng.annotations.Test;
 import com.google.refine.commands.CommandTestBase;
 
 public class TransposeRowsIntoColumnsCommandTests extends CommandTestBase {
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new TransposeRowsIntoColumnsCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new TransposeRowsIntoColumnsCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/column/MoveColumnCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/column/MoveColumnCommandTests.java
index da7f25b3b..a77f7611b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/column/MoveColumnCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/column/MoveColumnCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.column;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,16 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class MoveColumnCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new MoveColumnCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new MoveColumnCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RemoveColumnCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RemoveColumnCommandTests.java
index d666f0c3c..03b53e061 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RemoveColumnCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RemoveColumnCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.column;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class RemoveColumnCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new RemoveColumnCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new RemoveColumnCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RenameColumnCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RenameColumnCommandTests.java
index a0d8d94bc..3b159c9e5 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RenameColumnCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/column/RenameColumnCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.column;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class RenameColumnCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new RenameColumnCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new RenameColumnCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java
index 5196a248a..74bc18291 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ExpressionCommandTestBase.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.mock;
@@ -47,11 +48,12 @@ import com.google.refine.io.FileProjectManager;
 import com.google.refine.util.TestUtils;
 
 public class ExpressionCommandTestBase {
+
     protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
     protected Command command = null;
     protected StringWriter writer = null;
-    
+
     @BeforeMethod
     public void setUpRequestResponse() {
         request = mock(HttpServletRequest.class);
@@ -63,31 +65,32 @@ public class ExpressionCommandTestBase {
             e.printStackTrace();
         }
     }
-    
+
     public void initWorkspace(String expressionsJson, String starredExpressionsJson) {
         String starred = starredExpressionsJson == null ? "{\"class\":\"com.google.refine.preference.TopList\",\"top\":2147483647," +
                 "\"list\":[]}" : starredExpressionsJson;
-        String expressions = expressionsJson == null ? "{\"class\":\"com.google.refine.preference.TopList\",\"top\":100,\"list\":[]}" : expressionsJson;
-        String jsonData = "{\"projectIDs\":[]\n" + 
+        String expressions = expressionsJson == null ? "{\"class\":\"com.google.refine.preference.TopList\",\"top\":100,\"list\":[]}"
+                : expressionsJson;
+        String jsonData = "{\"projectIDs\":[]\n" +
                 ",\"preferences\":{\"entries\":{\"scripting.starred-expressions\":" + starred +
-                ",\"scripting.expressions\":"+expressions+"}}}";
+                ",\"scripting.expressions\":" + expressions + "}}}";
         initWorkspace(jsonData);
     }
 
-	public void initWorkspace(String jsonData) {
-		try {
+    public void initWorkspace(String jsonData) {
+        try {
             File workspaceDir = TestUtils.createTempDirectory("openrefine-test-workspace-dir");
             File jsonPath = new File(workspaceDir, "workspace.json");
-			FileUtils.writeStringToFile(jsonPath, jsonData);
+            FileUtils.writeStringToFile(jsonPath, jsonData);
             FileProjectManager.initialize(workspaceDir);
         } catch (IOException e) {
             e.printStackTrace();
         }
-	}
-    
-    public void assertResponseJsonIs(String expectedJson)  {
+    }
+
+    public void assertResponseJsonIs(String expectedJson) {
         String actualJson = writer.toString();
-        if(!TestUtils.equalAsJson(expectedJson, actualJson)) {
+        if (!TestUtils.equalAsJson(expectedJson, actualJson)) {
             try {
                 TestUtils.jsonDiff(expectedJson, actualJson);
             } catch (JsonParseException | JsonMappingException e) {
@@ -96,5 +99,5 @@ public class ExpressionCommandTestBase {
         }
         TestUtils.assertEqualsAsJson(actualJson, expectedJson);
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java
index 3c5281d2d..e68dddb5c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionHistoryCommandTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.expr;
 
 import java.io.IOException;
@@ -34,55 +35,56 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class GetExpressionHistoryCommandTests extends ExpressionCommandTestBase {
-    
+
     @BeforeMethod
     public void setUp() {
         command = new GetExpressionHistoryCommand();
     }
-    
+
     @Test
     public void testJsonResponse() throws ServletException, IOException {
 
-        initWorkspace("{\n" + 
-                "        \"class\": \"com.google.refine.preference.TopList\",\n" + 
-                "        \"top\": 100,\n" + 
-                "        \"list\": [\n" + 
-                "          \"grel:facetCount(value, 'value', 'Column 1')\",\n" + 
-                "          \"grel:facetCount(value, 'value', 'Column 3')\",\n" + 
+        initWorkspace("{\n" +
+                "        \"class\": \"com.google.refine.preference.TopList\",\n" +
+                "        \"top\": 100,\n" +
+                "        \"list\": [\n" +
+                "          \"grel:facetCount(value, 'value', 'Column 1')\",\n" +
+                "          \"grel:facetCount(value, 'value', 'Column 3')\",\n" +
                 "          \"grel:cell.recon.match.id\"" +
-                "]}", "{\n" + 
-                        "        \"class\": \"com.google.refine.preference.TopList\",\n" + 
-                        "        \"top\": 100,\n" + 
-                        "        \"list\": [\n" + 
-                        "          \"grel:cell.recon.match.id\"\n" + 
+                "]}",
+                "{\n" +
+                        "        \"class\": \"com.google.refine.preference.TopList\",\n" +
+                        "        \"top\": 100,\n" +
+                        "        \"list\": [\n" +
+                        "          \"grel:cell.recon.match.id\"\n" +
                         "]}");
-        
-        String json = "{\n" + 
-                "       \"expressions\" : [ {\n" + 
-                "         \"code\" : \"grel:facetCount(value, 'value', 'Column 1')\",\n" + 
-                "         \"global\" : false,\n" + 
-                "         \"starred\" : false\n" + 
-                "       }, {\n" + 
-                "         \"code\" : \"grel:facetCount(value, 'value', 'Column 3')\",\n" + 
-                "         \"global\" : false,\n" + 
-                "         \"starred\" : false\n" + 
-                "       }, {\n" + 
-                "         \"code\" : \"grel:cell.recon.match.id\",\n" + 
-                "         \"global\" : false,\n" + 
-                "         \"starred\" : true\n" + 
-                "       } ]\n" + 
+
+        String json = "{\n" +
+                "       \"expressions\" : [ {\n" +
+                "         \"code\" : \"grel:facetCount(value, 'value', 'Column 1')\",\n" +
+                "         \"global\" : false,\n" +
+                "         \"starred\" : false\n" +
+                "       }, {\n" +
+                "         \"code\" : \"grel:facetCount(value, 'value', 'Column 3')\",\n" +
+                "         \"global\" : false,\n" +
+                "         \"starred\" : false\n" +
+                "       }, {\n" +
+                "         \"code\" : \"grel:cell.recon.match.id\",\n" +
+                "         \"global\" : false,\n" +
+                "         \"starred\" : true\n" +
+                "       } ]\n" +
                 "     }";
         command.doGet(request, response);
         assertResponseJsonIs(json);
     }
-    
+
     @Test
     public void testUninitialized() throws ServletException, IOException {
 
         initWorkspace("{}");
-        
-        String json = "{\n" + 
-                "       \"expressions\" : []\n" + 
+
+        String json = "{\n" +
+                "       \"expressions\" : []\n" +
                 "     }";
         command.doGet(request, response);
         assertResponseJsonIs(json);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java
index 2ca45eccd..70fa9c7e7 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetExpressionLanguageInfoCommandTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.expr;
 
 import java.io.IOException;
@@ -43,20 +44,21 @@ public class GetExpressionLanguageInfoCommandTests extends ExpressionCommandTest
     public void setUp() {
         command = new GetExpressionLanguageInfoCommand();
     }
-    
+
     @Test
     public void testJsonResponse() throws ServletException, IOException {
 
         initWorkspace(null, null);
-        
+
         command.doGet(request, response);
         String jsonResponse = writer.toString();
         JsonNode result = ParsingUtilities.mapper.readValue(jsonResponse, JsonNode.class);
         TestUtils.assertEqualsAsJson(result.get("controls").get("filter").toString(),
                 "{\n" +
-                "           \"description\" : \"Evaluates expression a to an array. Then for each array element, binds its value to variable name v, evaluates expression test which should return a boolean. If the boolean is true, pushes v onto the result array.\",\n" + 
-                "           \"params\" : \"expression a, variable v, expression test\",\n" + 
-                "           \"returns\" : \"array\"\n" + 
-                "         }");
+                        "           \"description\" : \"Evaluates expression a to an array. Then for each array element, binds its value to variable name v, evaluates expression test which should return a boolean. If the boolean is true, pushes v onto the result array.\",\n"
+                        +
+                        "           \"params\" : \"expression a, variable v, expression test\",\n" +
+                        "           \"returns\" : \"array\"\n" +
+                        "         }");
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java
index 3ec11b4e2..3389761b0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/GetStarredExpressionsCommandTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.expr;
 
 import java.io.IOException;
@@ -39,40 +40,41 @@ public class GetStarredExpressionsCommandTests extends ExpressionCommandTestBase
     public void setUp() {
         command = new GetStarredExpressionsCommand();
     }
-    
+
     @Test
     public void testJsonResponse() throws ServletException, IOException {
 
-        initWorkspace("{\n" + 
-                "        \"class\": \"com.google.refine.preference.TopList\",\n" + 
-                "        \"top\": 100,\n" + 
-                "        \"list\": [\n" + 
-                "          \"grel:facetCount(value, 'value', 'Column 1')\",\n" + 
-                "          \"grel:facetCount(value, 'value', 'Column 3')\",\n" + 
+        initWorkspace("{\n" +
+                "        \"class\": \"com.google.refine.preference.TopList\",\n" +
+                "        \"top\": 100,\n" +
+                "        \"list\": [\n" +
+                "          \"grel:facetCount(value, 'value', 'Column 1')\",\n" +
+                "          \"grel:facetCount(value, 'value', 'Column 3')\",\n" +
                 "          \"grel:cell.recon.match.id\"" +
-                "]}", "{\n" + 
-                        "        \"class\": \"com.google.refine.preference.TopList\",\n" + 
-                        "        \"top\": 100,\n" + 
-                        "        \"list\": [\n" + 
-                        "          \"grel:cell.recon.match.id\"\n" + 
+                "]}",
+                "{\n" +
+                        "        \"class\": \"com.google.refine.preference.TopList\",\n" +
+                        "        \"top\": 100,\n" +
+                        "        \"list\": [\n" +
+                        "          \"grel:cell.recon.match.id\"\n" +
                         "]}");
-        
-        String json = "{\n" + 
-                "       \"expressions\" : [ {\n" + 
-                "         \"code\" : \"grel:cell.recon.match.id\"\n" + 
-                "       } ]\n" + 
+
+        String json = "{\n" +
+                "       \"expressions\" : [ {\n" +
+                "         \"code\" : \"grel:cell.recon.match.id\"\n" +
+                "       } ]\n" +
                 "     }";
         command.doGet(request, response);
         assertResponseJsonIs(json);
     }
-    
+
     @Test
     public void testUninitialized() throws ServletException, IOException {
 
         initWorkspace("{}");
-        
-        String json = "{\n" + 
-                "       \"expressions\" : []\n" + 
+
+        String json = "{\n" +
+                "       \"expressions\" : []\n" +
                 "     }";
         command.doGet(request, response);
         assertResponseJsonIs(json);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/LogExpressionCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/LogExpressionCommandTests.java
index 8a7acd604..0b01e6fb8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/LogExpressionCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/LogExpressionCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.when;
@@ -18,32 +19,32 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class LogExpressionCommandTests extends CommandTestBase {
-	
-	PreferenceStore prefStore;
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new LogExpressionCommand();
-		ProjectManager.singleton = mock(ProjectManager.class);
-		prefStore = new PreferenceStore();
-		when(ProjectManager.singleton.getPreferenceStore()).thenReturn(prefStore);
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-	
-	@Test
-	public void testNullExpressions() throws ServletException, IOException {
-		prefStore.put("scripting.expressions", null);
-		when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-		when(request.getParameter("expression")).thenReturn("grel:value+'a'");
-		
-		command.doPost(request, response);
-		
-		TopList topList = (TopList)prefStore.get("scripting.expressions");
-		Assert.assertEquals(topList.getList(), Collections.singletonList("grel:value+'a'"));
-	}
+
+    PreferenceStore prefStore;
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new LogExpressionCommand();
+        ProjectManager.singleton = mock(ProjectManager.class);
+        prefStore = new PreferenceStore();
+        when(ProjectManager.singleton.getPreferenceStore()).thenReturn(prefStore);
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+
+    @Test
+    public void testNullExpressions() throws ServletException, IOException {
+        prefStore.put("scripting.expressions", null);
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+        when(request.getParameter("expression")).thenReturn("grel:value+'a'");
+
+        command.doPost(request, response);
+
+        TopList topList = (TopList) prefStore.get("scripting.expressions");
+        Assert.assertEquals(topList.getList(), Collections.singletonList("grel:value+'a'"));
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java
index 1da69ce2c..d2e603ba0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/PreviewExpressionCommandTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.mock;
@@ -46,12 +47,13 @@ import com.google.refine.model.Project;
 import com.google.refine.util.TestUtils;
 
 public class PreviewExpressionCommandTests extends RefineTest {
+
     protected Project project = null;
     protected HttpServletRequest request = null;
     protected HttpServletResponse response = null;
     protected Command command = null;
     protected StringWriter writer = null;
-    
+
     @BeforeMethod
     public void setUpRequestResponse() {
         request = mock(HttpServletRequest.class);
@@ -65,7 +67,7 @@ public class PreviewExpressionCommandTests extends RefineTest {
         command = new PreviewExpressionCommand();
         project = createCSVProject("a,b\nc,d\ne,f\ng,h");
     }
-    
+
     @Test
     public void testJsonResponse() throws ServletException, IOException {
 
@@ -74,14 +76,14 @@ public class PreviewExpressionCommandTests extends RefineTest {
         when(request.getParameter("expression")).thenReturn("grel:value + \"_u\"");
         when(request.getParameter("rowIndices")).thenReturn("[0,2]");
 
-        String json = "{\n" + 
-                "       \"code\" : \"ok\",\n" + 
-                "       \"results\" : [ \"d_u\", \"h_u\" ]\n" + 
+        String json = "{\n" +
+                "       \"code\" : \"ok\",\n" +
+                "       \"results\" : [ \"d_u\", \"h_u\" ]\n" +
                 "     }";
         command.doPost(request, response);
         TestUtils.assertEqualsAsJson(writer.toString(), json);
     }
-    
+
     @Test
     public void testParseError() throws ServletException, IOException {
 
@@ -90,10 +92,10 @@ public class PreviewExpressionCommandTests extends RefineTest {
         when(request.getParameter("expression")).thenReturn("grel:value +");
         when(request.getParameter("rowIndices")).thenReturn("[0,2]");
 
-        String json = "{\n" + 
-                "       \"code\" : \"error\",\n" + 
-                "       \"message\" : \"Parsing error at offset 7: Expecting something more at end of expression\",\n" + 
-                "       \"type\" : \"parser\"\n" + 
+        String json = "{\n" +
+                "       \"code\" : \"error\",\n" +
+                "       \"message\" : \"Parsing error at offset 7: Expecting something more at end of expression\",\n" +
+                "       \"type\" : \"parser\"\n" +
                 "     }";
         command.doPost(request, response);
         TestUtils.assertEqualsAsJson(writer.toString(), json);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java
index a4f4a0c26..8923b9f90 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/expr/ToggleStarredExpressionCommandTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.expr;
 
 import static org.mockito.Mockito.when;
@@ -39,35 +40,36 @@ import com.google.refine.commands.Command;
 import com.google.refine.util.TestUtils;
 
 public class ToggleStarredExpressionCommandTests extends ExpressionCommandTestBase {
-    
+
     @BeforeMethod
     public void setUp() {
         command = new ToggleStarredExpressionCommand();
     }
-    
+
     @Test
     public void testJsonResponse() throws ServletException, IOException {
 
-        initWorkspace("{\n" + 
-                "        \"class\": \"com.google.refine.preference.TopList\",\n" + 
-                "        \"top\": 100,\n" + 
-                "        \"list\": [\n" + 
-                "          \"grel:facetCount(value, 'value', 'Column 1')\",\n" + 
-                "          \"grel:facetCount(value, 'value', 'Column 3')\",\n" + 
+        initWorkspace("{\n" +
+                "        \"class\": \"com.google.refine.preference.TopList\",\n" +
+                "        \"top\": 100,\n" +
+                "        \"list\": [\n" +
+                "          \"grel:facetCount(value, 'value', 'Column 1')\",\n" +
+                "          \"grel:facetCount(value, 'value', 'Column 3')\",\n" +
                 "          \"grel:cell.recon.match.id\"" +
-                "]}", "{\n" + 
-                        "        \"class\": \"com.google.refine.preference.TopList\",\n" + 
-                        "        \"top\": 100,\n" + 
-                        "        \"list\": [\n" + 
-                        "          \"grel:cell.recon.match.id\"\n" + 
+                "]}",
+                "{\n" +
+                        "        \"class\": \"com.google.refine.preference.TopList\",\n" +
+                        "        \"top\": 100,\n" +
+                        "        \"list\": [\n" +
+                        "          \"grel:cell.recon.match.id\"\n" +
                         "]}");
-        
-        String json = "{\n" + 
-                "       \"expressions\" : [ {\n" + 
-                "         \"code\" : \"grel:facetCount(value, 'value', 'Column 1')\"\n" + 
-                "       }, {\n" + 
-                "         \"code\" : \"grel:cell.recon.match.id\"\n" + 
-                "       } ]\n" + 
+
+        String json = "{\n" +
+                "       \"expressions\" : [ {\n" +
+                "         \"code\" : \"grel:facetCount(value, 'value', 'Column 1')\"\n" +
+                "       }, {\n" +
+                "         \"code\" : \"grel:cell.recon.match.id\"\n" +
+                "       } ]\n" +
                 "     }";
         when(request.getParameter("expression")).thenReturn("grel:facetCount(value, 'value', 'Column 1')");
         when(request.getParameter("returnList")).thenReturn("yes");
@@ -75,7 +77,7 @@ public class ToggleStarredExpressionCommandTests extends ExpressionCommandTestBa
         command.doPost(request, response);
         assertResponseJsonIs(json);
     }
-    
+
     @Test
     public void testCSRFProtection() throws ServletException, IOException {
         command.doPost(request, response);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/history/ApplyOperationsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/history/ApplyOperationsCommandTests.java
index d7422eb18..0f89a091d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/history/ApplyOperationsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/history/ApplyOperationsCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.history;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,16 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class ApplyOperationsCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new ApplyOperationsCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new ApplyOperationsCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/history/CancelProcessesCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/history/CancelProcessesCommandTests.java
index dcf3ec07e..0c7446d22 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/history/CancelProcessesCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/history/CancelProcessesCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.history;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class CancelProcessesCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new CancelProcessesCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new CancelProcessesCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/history/UndoRedoCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/history/UndoRedoCommandTests.java
index dc4ed459e..a2504f17c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/history/UndoRedoCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/history/UndoRedoCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.history;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class UndoRedoCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new UndoRedoCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new UndoRedoCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CancelImportingJobCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CancelImportingJobCommandTests.java
index b7c69e977..a5540c9c0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CancelImportingJobCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CancelImportingJobCommandTests.java
@@ -1,4 +1,6 @@
+
 package com.google.refine.commands.importing;
+
 import com.google.refine.commands.CommandTestBase;
 import java.io.IOException;
 
@@ -8,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class CancelImportingJobCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new CancelImportingJobCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new CancelImportingJobCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CreateImportingJobCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CreateImportingJobCommandTests.java
index 70f44ff52..70462f3e5 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CreateImportingJobCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/CreateImportingJobCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.importing;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class CreateImportingJobCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new CreateImportingJobCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new CreateImportingJobCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/ImportingControllerCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/ImportingControllerCommandTests.java
index 7f3a29da6..e1b145717 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/ImportingControllerCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/importing/ImportingControllerCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.importing;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,16 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class ImportingControllerCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new ImportingControllerCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new ImportingControllerCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/lang/LoadLanguageCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/lang/LoadLanguageCommandTests.java
index a5f71edba..ce569b5d3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/lang/LoadLanguageCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/lang/LoadLanguageCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.lang;
 
 import static org.mockito.Mockito.mock;
@@ -43,7 +44,7 @@ public class LoadLanguageCommandTests extends CommandTestBase {
     @Test
     public void testLoadLanguages() throws ServletException, IOException {
         when(request.getParameter("module")).thenReturn("core");
-        when(request.getParameterValues("lang")).thenReturn(new String[] {"en"});
+        when(request.getParameterValues("lang")).thenReturn(new String[] { "en" });
 
         command.doPost(request, response);
 
@@ -55,7 +56,7 @@ public class LoadLanguageCommandTests extends CommandTestBase {
     @Test
     public void testLoadUnknownLanguage() throws ServletException, IOException {
         when(request.getParameter("module")).thenReturn("core");
-        when(request.getParameterValues("lang")).thenReturn(new String[] {"foobar"});
+        when(request.getParameterValues("lang")).thenReturn(new String[] { "foobar" });
 
         command.doPost(request, response);
 
@@ -98,4 +99,3 @@ public class LoadLanguageCommandTests extends CommandTestBase {
         assertEquals(merged, expected);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/ImportProjectCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/ImportProjectCommandTests.java
index 063f526e6..2fd6d8de3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/ImportProjectCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/ImportProjectCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.project;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,16 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class ImportProjectCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new ImportProjectCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new ImportProjectCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java
index 4b60756e0..251c5801f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.project;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class RenameProjectCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new RenameProjectCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new RenameProjectCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java
index 3f1fe8ffa..d80f3b8fb 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java
@@ -69,7 +69,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     // System Under Test
     SetProjectMetadataCommand SUT = null;
 
@@ -95,16 +95,16 @@ public class SetProjectMetadataCommandTests extends RefineTest {
         request = mock(HttpServletRequest.class);
         response = mock(HttpServletResponse.class);
         SUT = new SetProjectMetadataCommand();
-        
+
         ProjectMetadata metadata = new ProjectMetadata();
         metadata.setUserMetadata((ArrayNode) ParsingUtilities.mapper.readTree("[ {name: \"clientID\", display: true} ]"));
-        
+
         // mock dependencies
         when(request.getParameter("project")).thenReturn(PROJECT_ID);
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(projMan.getProject(anyLong())).thenReturn(proj);
         when(proj.getMetadata()).thenReturn(metadata);
-        
+
         try {
             when(response.getWriter()).thenReturn(pw);
         } catch (IOException e1) {
@@ -125,13 +125,13 @@ public class SetProjectMetadataCommandTests extends RefineTest {
     }
 
     /**
-     *  Contract for a complete working post
+     * Contract for a complete working post
      */
     @Test
     public void setMetadataTest() {
         when(request.getParameter("name")).thenReturn("subject");
         when(request.getParameter("value")).thenReturn(SUBJECT);
-        
+
         // run
         try {
             SUT.doPost(request, response);
@@ -141,73 +141,74 @@ public class SetProjectMetadataCommandTests extends RefineTest {
             Assert.fail();
         }
 
-        // verify
-        verify(request, times(2)).getParameter("project");      
-        verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
-
-        verify(response, times(1))
-                .setHeader("Content-Type", "application/json");
-        verify(proj, times(1)).getMetadata();
-        try {
-            verify(response, times(1)).getWriter();
-        } catch (IOException e) {
-            Assert.fail();
-        }
-        verify(pw, times(1)).write("{ \"code\" : \"ok\" }");
-        
-        Assert.assertEquals(proj.getMetadata().getSubject(), SUBJECT);
-    }
-    
-    /**
-     *  set a user defined metadata field
-     * @throws JSONException 
-     */
-    @Test
-    public void setUserMetadataFieldTest() {
-        when(request.getParameter("name")).thenReturn("clientID");
-        when(request.getParameter("value")).thenReturn("IBM");
-        
-        // run
-        try {
-            SUT.doPost(request, response);
-        } catch (ServletException e) {
-            Assert.fail();
-        } catch (IOException e) {
-            Assert.fail();
-        }
-
-        // verify
-        verify(request, times(2)).getParameter("project");      
-        verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
-
-        verify(response, times(1))
-                .setHeader("Content-Type", "application/json");
-        verify(proj, times(1)).getMetadata();
-        try {
-            verify(response, times(1)).getWriter();
-        } catch (IOException e) {
-            Assert.fail();
-        }
-        verify(pw, times(1)).write("{ \"code\" : \"ok\" }");
-        
-        ObjectNode obj = (ObjectNode) proj.getMetadata().getUserMetadata().get(0);
-        Assert.assertEquals(obj.get("name").asText(), "clientID");
-        Assert.assertEquals(obj.get("value").asText(), "IBM");
-    }
-    
-     @Test
-     public void doPostThrowsIfCommand_getProjectReturnsNull(){
-        // run
-        try {
-            SUT.doPost(request, response);
-        } catch (ServletException e) {
-            //expected
-        } catch (IOException e) {
-            Assert.fail();
-        }
-
         // verify
         verify(request, times(2)).getParameter("project");
         verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
-     }
+
+        verify(response, times(1))
+                .setHeader("Content-Type", "application/json");
+        verify(proj, times(1)).getMetadata();
+        try {
+            verify(response, times(1)).getWriter();
+        } catch (IOException e) {
+            Assert.fail();
+        }
+        verify(pw, times(1)).write("{ \"code\" : \"ok\" }");
+
+        Assert.assertEquals(proj.getMetadata().getSubject(), SUBJECT);
+    }
+
+    /**
+     * set a user defined metadata field
+     * 
+     * @throws JSONException
+     */
+    @Test
+    public void setUserMetadataFieldTest() {
+        when(request.getParameter("name")).thenReturn("clientID");
+        when(request.getParameter("value")).thenReturn("IBM");
+
+        // run
+        try {
+            SUT.doPost(request, response);
+        } catch (ServletException e) {
+            Assert.fail();
+        } catch (IOException e) {
+            Assert.fail();
+        }
+
+        // verify
+        verify(request, times(2)).getParameter("project");
+        verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
+
+        verify(response, times(1))
+                .setHeader("Content-Type", "application/json");
+        verify(proj, times(1)).getMetadata();
+        try {
+            verify(response, times(1)).getWriter();
+        } catch (IOException e) {
+            Assert.fail();
+        }
+        verify(pw, times(1)).write("{ \"code\" : \"ok\" }");
+
+        ObjectNode obj = (ObjectNode) proj.getMetadata().getUserMetadata().get(0);
+        Assert.assertEquals(obj.get("name").asText(), "clientID");
+        Assert.assertEquals(obj.get("value").asText(), "IBM");
+    }
+
+    @Test
+    public void doPostThrowsIfCommand_getProjectReturnsNull() {
+        // run
+        try {
+            SUT.doPost(request, response);
+        } catch (ServletException e) {
+            // expected
+        } catch (IOException e) {
+            Assert.fail();
+        }
+
+        // verify
+        verify(request, times(2)).getParameter("project");
+        verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java
index 3b073fac4..15726ee49 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.project;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class SetProjectTagsCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new SetProjectTagsCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new SetProjectTagsCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/GuessTypesOfColumnCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/GuessTypesOfColumnCommandTests.java
index d8fa4aa37..9c309c0d0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/GuessTypesOfColumnCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/GuessTypesOfColumnCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.recon;
 
 import static org.mockito.Mockito.mock;
@@ -26,18 +27,18 @@ import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
 public class GuessTypesOfColumnCommandTests extends RefineTest {
-    
+
     HttpServletRequest request = null;
     HttpServletResponse response = null;
     GuessTypesOfColumnCommand command = null;
     StringWriter writer = null;
     Project project = null;
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new GuessTypesOfColumnCommand();
-		command.setSampleSize(2);
-		request = mock(HttpServletRequest.class);
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new GuessTypesOfColumnCommand();
+        command.setSampleSize(2);
+        request = mock(HttpServletRequest.class);
         response = mock(HttpServletResponse.class);
         writer = new StringWriter();
         try {
@@ -45,110 +46,110 @@ public class GuessTypesOfColumnCommandTests extends RefineTest {
         } catch (IOException e) {
             e.printStackTrace();
         }
-		project = createCSVProject(
-		        "foo,bar\n"
-		        + "France,b\n"
-		        + "Japan,d\n"
-		        + "Paraguay,x");
-		
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		TestUtils.assertEqualAsJson("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", writer.toString());
-	}
-	
-	@Test
-	public void testGuessTypes() throws IOException, ServletException, InterruptedException {
-	    when(request.getParameter("project")).thenReturn(Long.toString(project.id));
-	    when(request.getParameter("columnName")).thenReturn("foo");
-	    when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-	    
-	    String expectedQuery = "queries=%7B%22q1%22%3A%7B%22query%22%3A%22Japan%22%2C%22limit%22"+
-	            "%3A3%7D%2C%22q0%22%3A%7B%22query%22%3A%22France%22%2C%22limit%22%3A3%7D%7D";
-	    
-	    String serviceResponse = "{\n" + 
-	            "  \"q0\": {\n" + 
-	            "    \"result\": [\n" + 
-	            "      {\n" + 
-	            "        \"id\": \"Q17\",\n" + 
-	            "        \"name\": \"Japan\",\n" + 
-	            "        \"type\": [\n" + 
-	            "          {\n" + 
-	            "            \"id\": \"Q3624078\",\n" + 
-	            "            \"name\": \"sovereign state\"\n" + 
-	            "          },\n" + 
-	            "          {\n" + 
-	            "            \"id\": \"Q112099\",\n" + 
-	            "            \"name\": \"island nation\"\n" + 
-	            "          },\n" + 
-	            "          {\n" + 
-	            "            \"id\": \"Q6256\",\n" + 
-	            "            \"name\": \"country\"\n" + 
-	            "          }\n" + 
-	            "        ]\n" + 
-	            "      }\n" + 
-	            "    ]\n" + 
-	            "  },\n" + 
-	            "  \"q1\": {\n" + 
-	            "    \"result\": [\n" + 
-	            "      {\n" + 
-	            "        \"id\": \"Q142\",\n" + 
-	            "        \"name\": \"France\",\n" + 
-	            "        \"type\": [\n" + 
-	            "          {\n" + 
-	            "            \"id\": \"Q3624078\",\n" + 
-	            "            \"name\": \"sovereign state\"\n" + 
-	            "          },\n" + 
-	            "          {\n" + 
-	            "            \"id\": \"Q20181813\",\n" + 
-	            "            \"name\": \"colonial power\"\n" + 
-	            "          }\n" + 
-	            "        ]\n" + 
-	            "      }\n" + 
-	            "    ]\n" + 
-	            "  }\n" + 
-	            "}";
-	    
-	    String guessedTypes = "{\n" + 
-	            "       \"code\" : \"ok\",\n" + 
-	            "       \"types\" : [ {\n" + 
-	            "         \"count\" : 2,\n" + 
-	            "         \"id\" : \"Q3624078\",\n" + 
-	            "         \"name\" : \"sovereign state\",\n" + 
-	            "         \"score\" : 2\n" + 
-	            "       }, {\n" + 
-	            "         \"count\" : 1,\n" + 
-	            "         \"id\" : \"Q112099\",\n" + 
-	            "         \"name\" : \"island nation\",\n" + 
-	            "         \"score\" : 0.6666666666666666\n" + 
-	            "       }, {\n" + 
-	            "         \"count\" : 1,\n" + 
-	            "         \"id\" : \"Q20181813\",\n" + 
-	            "         \"name\" : \"colonial power\",\n" + 
-	            "         \"score\" : 0.5\n" + 
-	            "       }, {\n" + 
-	            "         \"count\" : 1,\n" + 
-	            "         \"id\" : \"Q6256\",\n" + 
-	            "         \"name\" : \"country\",\n" + 
-	            "         \"score\" : 0.3333333333333333\n" + 
-	            "       } ]\n" + 
-	            "     }";
-	    
-	    try (MockWebServer server = new MockWebServer()) {
+        project = createCSVProject(
+                "foo,bar\n"
+                        + "France,b\n"
+                        + "Japan,d\n"
+                        + "Paraguay,x");
+
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        TestUtils.assertEqualAsJson("{\"code\":\"error\",\"message\":\"Missing or invalid csrf_token parameter\"}", writer.toString());
+    }
+
+    @Test
+    public void testGuessTypes() throws IOException, ServletException, InterruptedException {
+        when(request.getParameter("project")).thenReturn(Long.toString(project.id));
+        when(request.getParameter("columnName")).thenReturn("foo");
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+
+        String expectedQuery = "queries=%7B%22q1%22%3A%7B%22query%22%3A%22Japan%22%2C%22limit%22" +
+                "%3A3%7D%2C%22q0%22%3A%7B%22query%22%3A%22France%22%2C%22limit%22%3A3%7D%7D";
+
+        String serviceResponse = "{\n" +
+                "  \"q0\": {\n" +
+                "    \"result\": [\n" +
+                "      {\n" +
+                "        \"id\": \"Q17\",\n" +
+                "        \"name\": \"Japan\",\n" +
+                "        \"type\": [\n" +
+                "          {\n" +
+                "            \"id\": \"Q3624078\",\n" +
+                "            \"name\": \"sovereign state\"\n" +
+                "          },\n" +
+                "          {\n" +
+                "            \"id\": \"Q112099\",\n" +
+                "            \"name\": \"island nation\"\n" +
+                "          },\n" +
+                "          {\n" +
+                "            \"id\": \"Q6256\",\n" +
+                "            \"name\": \"country\"\n" +
+                "          }\n" +
+                "        ]\n" +
+                "      }\n" +
+                "    ]\n" +
+                "  },\n" +
+                "  \"q1\": {\n" +
+                "    \"result\": [\n" +
+                "      {\n" +
+                "        \"id\": \"Q142\",\n" +
+                "        \"name\": \"France\",\n" +
+                "        \"type\": [\n" +
+                "          {\n" +
+                "            \"id\": \"Q3624078\",\n" +
+                "            \"name\": \"sovereign state\"\n" +
+                "          },\n" +
+                "          {\n" +
+                "            \"id\": \"Q20181813\",\n" +
+                "            \"name\": \"colonial power\"\n" +
+                "          }\n" +
+                "        ]\n" +
+                "      }\n" +
+                "    ]\n" +
+                "  }\n" +
+                "}";
+
+        String guessedTypes = "{\n" +
+                "       \"code\" : \"ok\",\n" +
+                "       \"types\" : [ {\n" +
+                "         \"count\" : 2,\n" +
+                "         \"id\" : \"Q3624078\",\n" +
+                "         \"name\" : \"sovereign state\",\n" +
+                "         \"score\" : 2\n" +
+                "       }, {\n" +
+                "         \"count\" : 1,\n" +
+                "         \"id\" : \"Q112099\",\n" +
+                "         \"name\" : \"island nation\",\n" +
+                "         \"score\" : 0.6666666666666666\n" +
+                "       }, {\n" +
+                "         \"count\" : 1,\n" +
+                "         \"id\" : \"Q20181813\",\n" +
+                "         \"name\" : \"colonial power\",\n" +
+                "         \"score\" : 0.5\n" +
+                "       }, {\n" +
+                "         \"count\" : 1,\n" +
+                "         \"id\" : \"Q6256\",\n" +
+                "         \"name\" : \"country\",\n" +
+                "         \"score\" : 0.3333333333333333\n" +
+                "       } ]\n" +
+                "     }";
+
+        try (MockWebServer server = new MockWebServer()) {
             server.start();
             HttpUrl url = server.url("/api");
             server.enqueue(new MockResponse().setBody(serviceResponse));
-            
+
             when(request.getParameter("service")).thenReturn(url.toString());
-            
+
             command.doPost(request, response);
-            
+
             TestUtils.assertEqualAsJson(guessedTypes, writer.toString());
-            
+
             RecordedRequest request = server.takeRequest();
             Assert.assertEquals(request.getBody().readUtf8(), expectedQuery);
-	    }
-	}
+        }
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/PreviewExtendDataCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/PreviewExtendDataCommandTests.java
index b4c04eddd..65d985a9f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/PreviewExtendDataCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/PreviewExtendDataCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.recon;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class PreviewExtendDataCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new PreviewExtendDataCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new PreviewExtendDataCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconClearOneCellCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconClearOneCellCommandTests.java
index 72ca77b73..2300556d2 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconClearOneCellCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconClearOneCellCommandTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.commands.recon;
 
 import com.google.refine.commands.CommandTestBase;
@@ -9,16 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class ReconClearOneCellCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new ReconClearOneCellCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new ReconClearOneCellCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java
index b53b11249..0504d922d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.recon;
 
 import static org.mockito.Mockito.mock;
@@ -53,52 +54,52 @@ import com.google.refine.model.recon.ReconConfig;
 import com.google.refine.model.recon.StandardReconConfig;
 
 public class ReconJudgeOneCellCommandTest extends RefineTest {
-        
+
     Project project = null;
     HttpServletRequest request = null;
     HttpServletResponse response = null;
     Command command = null;
     PrintWriter writer = null;
-    
+
     @BeforeMethod
     public void setUp() {
         project = createCSVProject(
-                "reconciled column,unreconciled column\n"+
-                "a,b\n"+
-                "c,d\n");
+                "reconciled column,unreconciled column\n" +
+                        "a,b\n" +
+                        "c,d\n");
         Column reconciled = project.columnModel.columns.get(0);
         ReconConfig config = new StandardReconConfig(
                 "http://my.recon.service/api",
                 "http://my.recon.service/rdf/space",
                 "http://my.recon.service/rdf/schema",
-                "type3894", 
+                "type3894",
                 "octopus",
                 true,
                 Collections.emptyList(),
                 5);
         reconciled.setReconConfig(config);
-        
+
         request = mock(HttpServletRequest.class);
         response = mock(HttpServletResponse.class);
-        
+
         when(request.getParameter("project")).thenReturn(String.valueOf(project.id));
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-        
+
         writer = mock(PrintWriter.class);
         try {
             when(response.getWriter()).thenReturn(writer);
         } catch (IOException e1) {
             Assert.fail();
         }
-        
-        command = new  ReconJudgeOneCellCommand();
+
+        command = new ReconJudgeOneCellCommand();
     }
-    
+
     @AfterMethod
     public void tearDown() {
         ProjectManager.singleton.deleteProject(project.id);
     }
-    
+
     @Test
     public void testMarkOneCellInReconciledColumn() throws Exception {
 
@@ -106,12 +107,12 @@ public class ReconJudgeOneCellCommandTest extends RefineTest {
         when(request.getParameter("cell")).thenReturn("0");
         when(request.getParameter("judgment")).thenReturn("new");
         command.doPost(request, response);
-        
+
         Cell cell = project.rows.get(0).cells.get(0);
         Assert.assertEquals(Recon.Judgment.New, cell.recon.judgment);
         Assert.assertEquals("http://my.recon.service/rdf/space", cell.recon.identifierSpace);
     }
-    
+
     @Test
     public void testMarkOneCellWithCustomSpace() throws Exception {
 
@@ -121,7 +122,7 @@ public class ReconJudgeOneCellCommandTest extends RefineTest {
         when(request.getParameter("identifierSpace")).thenReturn("http://my.custom.space/id");
         when(request.getParameter("schemaSpace")).thenReturn("http://my.custom.space/schema");
         command.doPost(request, response);
-        
+
         Cell cell = project.rows.get(0).cells.get(0);
         Assert.assertEquals(Recon.Judgment.New, cell.recon.judgment);
         Assert.assertEquals("http://my.custom.space/id", cell.recon.identifierSpace);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/row/AnnotateOneRowCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/row/AnnotateOneRowCommandTests.java
index 1b1e19e91..880ba3f07 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/row/AnnotateOneRowCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/row/AnnotateOneRowCommandTests.java
@@ -1,4 +1,6 @@
+
 package com.google.refine.commands.row;
+
 import com.google.refine.commands.CommandTestBase;
 import java.io.IOException;
 
@@ -8,15 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class AnnotateOneRowCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new AnnotateOneRowCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
+
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new AnnotateOneRowCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/row/DenormalizeCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/row/DenormalizeCommandTests.java
index 885806bc5..cb063a28f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/row/DenormalizeCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/row/DenormalizeCommandTests.java
@@ -1,4 +1,6 @@
+
 package com.google.refine.commands.row;
+
 import com.google.refine.commands.CommandTestBase;
 import java.io.IOException;
 
@@ -8,16 +10,15 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class DenormalizeCommandTests extends CommandTestBase {
-	
-	@BeforeMethod
-	public void setUpCommand() {
-		command = new DenormalizeCommand();
-	}
-	
-	@Test
-	public void testCSRFProtection() throws ServletException, IOException {
-		command.doPost(request, response);
-		assertCSRFCheckFailed();
-	}
-}
 
+    @BeforeMethod
+    public void setUpCommand() {
+        command = new DenormalizeCommand();
+    }
+
+    @Test
+    public void testCSRFProtection() throws ServletException, IOException {
+        command.doPost(request, response);
+        assertCSRFCheckFailed();
+    }
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java
index 7ecd15e9e..b237a6e1f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/row/GetRowsCommandTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.commands.row;
 
 import static org.mockito.Mockito.mock;
@@ -46,13 +47,13 @@ import com.google.refine.model.Project;
 import com.google.refine.util.TestUtils;
 
 public class GetRowsCommandTest extends RefineTest {
-    
+
     HttpServletRequest request = null;
     HttpServletResponse response = null;
     Command command = null;
     Project project = null;
     StringWriter writer = null;
-    
+
     @BeforeMethod
     public void setUp() {
         request = mock(HttpServletRequest.class);
@@ -67,73 +68,73 @@ public class GetRowsCommandTest extends RefineTest {
             e.printStackTrace();
         }
     }
-    
+
     @Test
     public void testJsonOutputRows() throws ServletException, IOException {
-        String rowJson = "{\n" + 
-                "       \"filtered\" : 2,\n" + 
-                "       \"limit\" : 2,\n" + 
-                "       \"mode\" : \"row-based\",\n" + 
-                "       \"pool\" : {\n" + 
-                "         \"recons\" : { }\n" + 
-                "       },\n" + 
-                "       \"rows\" : [ {\n" + 
-                "         \"cells\" : [ {\n" + 
-                "           \"v\" : \"c\"\n" + 
-                "         }, {\n" + 
-                "           \"v\" : \"d\"\n" + 
-                "         } ],\n" + 
-                "         \"flagged\" : false,\n" + 
-                "         \"i\" : 0,\n" + 
-                "         \"starred\" : false\n" + 
-                "       }, {\n" + 
-                "         \"cells\" : [ null, {\n" + 
-                "           \"v\" : \"f\"\n" + 
-                "         } ],\n" + 
-                "         \"flagged\" : false,\n" + 
-                "         \"i\" : 1,\n" + 
-                "         \"starred\" : false\n" + 
-                "       } ],\n" + 
-                "       \"start\" : 0,\n" + 
-                "       \"total\" : 2\n" + 
+        String rowJson = "{\n" +
+                "       \"filtered\" : 2,\n" +
+                "       \"limit\" : 2,\n" +
+                "       \"mode\" : \"row-based\",\n" +
+                "       \"pool\" : {\n" +
+                "         \"recons\" : { }\n" +
+                "       },\n" +
+                "       \"rows\" : [ {\n" +
+                "         \"cells\" : [ {\n" +
+                "           \"v\" : \"c\"\n" +
+                "         }, {\n" +
+                "           \"v\" : \"d\"\n" +
+                "         } ],\n" +
+                "         \"flagged\" : false,\n" +
+                "         \"i\" : 0,\n" +
+                "         \"starred\" : false\n" +
+                "       }, {\n" +
+                "         \"cells\" : [ null, {\n" +
+                "           \"v\" : \"f\"\n" +
+                "         } ],\n" +
+                "         \"flagged\" : false,\n" +
+                "         \"i\" : 1,\n" +
+                "         \"starred\" : false\n" +
+                "       } ],\n" +
+                "       \"start\" : 0,\n" +
+                "       \"total\" : 2\n" +
                 "     }";
-        
+
         when(request.getParameter("engine")).thenReturn("{\"mode\":\"row-based\",\"facets\":[]}");
         command.doPost(request, response);
         TestUtils.assertEqualsAsJson(writer.toString(), rowJson);
     }
-    
+
     @Test
     public void testJsonOutputRecords() throws ServletException, IOException {
-        String recordJson = "{\n" + 
-                "       \"filtered\" : 1,\n" + 
-                "       \"limit\" : 2,\n" + 
-                "       \"mode\" : \"record-based\",\n" + 
-                "       \"pool\" : {\n" + 
-                "         \"recons\" : { }\n" + 
-                "       },\n" + 
-                "       \"rows\" : [ {\n" + 
-                "         \"cells\" : [ {\n" + 
-                "           \"v\" : \"c\"\n" + 
-                "         }, {\n" + 
-                "           \"v\" : \"d\"\n" + 
-                "         } ],\n" + 
-                "         \"flagged\" : false,\n" + 
-                "         \"i\" : 0,\n" + 
-                "         \"j\" : 0,\n" + 
-                "         \"starred\" : false\n" + 
-                "       }, {\n" + 
-                "         \"cells\" : [ null, {\n" + 
-                "           \"v\" : \"f\"\n" + 
-                "         } ],\n" + 
-                "         \"flagged\" : false,\n" + 
-                "         \"i\" : 1,\n" + 
-                "         \"starred\" : false\n" + 
-                "       } ],\n" + 
-                "       \"start\" : 0,\n" + 
-                "       \"total\" : 1\n" + 
+        String recordJson = "{\n" +
+                "       \"filtered\" : 1,\n" +
+                "       \"limit\" : 2,\n" +
+                "       \"mode\" : \"record-based\",\n" +
+                "       \"pool\" : {\n" +
+                "         \"recons\" : { }\n" +
+                "       },\n" +
+                "       \"rows\" : [ {\n" +
+                "         \"cells\" : [ {\n" +
+                "           \"v\" : \"c\"\n" +
+                "         }, {\n" +
+                "           \"v\" : \"d\"\n" +
+                "         } ],\n" +
+                "         \"flagged\" : false,\n" +
+                "         \"i\" : 0,\n" +
+                "         \"j\" : 0,\n" +
+                "         \"starred\" : false\n" +
+                "       }, {\n" +
+                "         \"cells\" : [ null, {\n" +
+                "           \"v\" : \"f\"\n" +
+                "         } ],\n" +
+                "         \"flagged\" : false,\n" +
+                "         \"i\" : 1,\n" +
+                "         \"starred\" : false\n" +
+                "       } ],\n" +
+                "       \"start\" : 0,\n" +
+                "       \"total\" : 1\n" +
                 "     }";
-        
+
         when(request.getParameter("engine")).thenReturn("{\"mode\":\"record-based\",\"facets\":[]}");
         command.doPost(request, response);
         TestUtils.assertEqualsAsJson(writer.toString(), recordJson);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java b/OpenRefine/main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java
index 40fe5f70d..d1304b793 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/commands/util/CancelProcessesCommandTests.java
@@ -69,7 +69,7 @@ public class CancelProcessesCommandTests extends RefineTest {
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     // System Under Test
     CancelProcessesCommand SUT = null;
 
@@ -119,8 +119,8 @@ public class CancelProcessesCommandTests extends RefineTest {
         try {
             SUT.doPost(null, null);
             Assert.fail(); // should have thrown exception by this point
-        } catch (IllegalArgumentException e){
-            //expected
+        } catch (IllegalArgumentException e) {
+            // expected
         } catch (ServletException e) {
             Assert.fail();
         } catch (Exception e) {
@@ -131,8 +131,8 @@ public class CancelProcessesCommandTests extends RefineTest {
         try {
             SUT.doPost(null, response);
             Assert.fail(); // should have thrown exception by this point
-        } catch (IllegalArgumentException e){
-            //expected
+        } catch (IllegalArgumentException e) {
+            // expected
         } catch (ServletException e) {
             Assert.fail();
         } catch (Exception e) {
@@ -143,7 +143,7 @@ public class CancelProcessesCommandTests extends RefineTest {
         try {
             SUT.doPost(request, null);
             Assert.fail(); // should have thrown exception by this point
-        } catch (IllegalArgumentException e){
+        } catch (IllegalArgumentException e) {
             // expected
         } catch (ServletException e) {
             Assert.fail();
@@ -153,7 +153,7 @@ public class CancelProcessesCommandTests extends RefineTest {
     }
 
     /**
-     *  Contract for a complete working post
+     * Contract for a complete working post
      */
     @Test
     public void doPostRegressionTest() {
@@ -195,13 +195,13 @@ public class CancelProcessesCommandTests extends RefineTest {
         TestUtils.assertEqualsAsJson(sw.toString(), "{ \"code\" : \"ok\" }");
     }
 
-     @Test
-     public void doPostThrowsIfCommand_getProjectReturnsNull(){
+    @Test
+    public void doPostThrowsIfCommand_getProjectReturnsNull() {
         // mock dependencies
         when(request.getParameter("project")).thenReturn(PROJECT_ID);
         when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
         when(projMan.getProject(anyLong()))
-            .thenReturn(null);
+                .thenReturn(null);
         try {
             when(response.getWriter()).thenReturn(pw);
         } catch (IOException e1) {
@@ -212,7 +212,7 @@ public class CancelProcessesCommandTests extends RefineTest {
         try {
             SUT.doPost(request, response);
         } catch (ServletException e) {
-            //expected
+            // expected
         } catch (IOException e) {
             Assert.fail();
         }
@@ -220,40 +220,40 @@ public class CancelProcessesCommandTests extends RefineTest {
         // verify
         verify(request, times(1)).getParameter("project");
         verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
-     }
+    }
 
-     @Test
-     public void doPostCatchesExceptionFromWriter(){
-         String ERROR_MESSAGE = "hello world";
+    @Test
+    public void doPostCatchesExceptionFromWriter() {
+        String ERROR_MESSAGE = "hello world";
 
         // mock dependencies
-            when(request.getParameter("project")).thenReturn(PROJECT_ID);
-            when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
-            when(projMan.getProject(anyLong())).thenReturn(proj);
-            when(proj.getProcessManager()).thenReturn(processMan);
-            try {
-                when(response.getWriter()).thenThrow(new IllegalStateException(ERROR_MESSAGE))
-                .thenReturn(pw);
-            } catch (IOException e) {
-                Assert.fail();
-            }
+        when(request.getParameter("project")).thenReturn(PROJECT_ID);
+        when(request.getParameter("csrf_token")).thenReturn(Command.csrfFactory.getFreshToken());
+        when(projMan.getProject(anyLong())).thenReturn(proj);
+        when(proj.getProcessManager()).thenReturn(processMan);
+        try {
+            when(response.getWriter()).thenThrow(new IllegalStateException(ERROR_MESSAGE))
+                    .thenReturn(pw);
+        } catch (IOException e) {
+            Assert.fail();
+        }
 
-            // run
-            try {
-                SUT.doPost(request, response);
-            } catch (ServletException e) {
-                Assert.fail();
-            } catch (IOException e) {
-                Assert.fail();
-            }
+        // run
+        try {
+            SUT.doPost(request, response);
+        } catch (ServletException e) {
+            Assert.fail();
+        } catch (IOException e) {
+            Assert.fail();
+        }
 
-            verify(request, times(1)).getParameter("project");
-            verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
+        verify(request, times(1)).getParameter("project");
+        verify(projMan, times(1)).getProject(PROJECT_ID_LONG);
 
-            verify(processMan, times(1)).cancelAll();
-            verify(response, times(2)).setCharacterEncoding("UTF-8");
-            //omitted other verifications for brevity.
-            //assumption is that expecting response.setCharacterEncoding times(3)
-            //implies it has Command.respondException has been called as expected
-     }
+        verify(processMan, times(1)).cancelAll();
+        verify(response, times(2)).setCharacterEncoding("UTF-8");
+        // omitted other verifications for brevity.
+        // assumption is that expecting response.setCharacterEncoding times(3)
+        // implies it has Command.respondException has been called as expected
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java
index 11475a227..8c81725d8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/CsvExporterTests.java
@@ -65,17 +65,17 @@ public class CsvExporterTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     StringWriter writer;
     Project project;
     Engine engine;
     Properties options;
 
-    //System Under Test
+    // System Under Test
     CsvExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new CsvExporter();
         writer = new StringWriter();
         project = new Project();
@@ -84,7 +84,7 @@ public class CsvExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         writer = null;
         project = null;
@@ -93,7 +93,7 @@ public class CsvExporterTests extends RefineTest {
     }
 
     @Test
-    public void exportSimpleCsv(){
+    public void exportSimpleCsv() {
         CreateGrid(2, 2);
 
         try {
@@ -103,12 +103,12 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0,column1\n" +
-                                               "row0cell0,row0cell1\n" +
-                                               "row1cell0,row1cell1\n");
+                "row0cell0,row0cell1\n" +
+                "row1cell0,row1cell1\n");
     }
 
     @Test
-    public void exportSimpleCsvNoHeader(){
+    public void exportSimpleCsvNoHeader() {
         CreateGrid(2, 2);
         when(options.getProperty("printColumnHeader")).thenReturn("false");
         try {
@@ -118,13 +118,13 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "row0cell0,row0cell1\n" +
-                                               "row1cell0,row1cell1\n");
+                "row1cell0,row1cell1\n");
 
-        verify(options,times(2)).getProperty("printColumnHeader");
+        verify(options, times(2)).getProperty("printColumnHeader");
     }
 
     @Test
-    public void exportSimpleCsvCustomLineSeparator(){
+    public void exportSimpleCsvCustomLineSeparator() {
         CreateGrid(2, 2);
         when(options.getProperty("options")).thenReturn("{\"lineSeparator\":\"X\"}");
 
@@ -135,12 +135,12 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0,column1X" +
-                                               "row0cell0,row0cell1X" +
-                                               "row1cell0,row1cell1X");
+                "row0cell0,row0cell1X" +
+                "row1cell0,row1cell1X");
     }
 
     @Test
-    public void exportSimpleCsvQuoteAll(){
+    public void exportSimpleCsvQuoteAll() {
         CreateGrid(2, 2);
         when(options.getProperty("options")).thenReturn("{\"quoteAll\":\"true\"}");
 
@@ -151,13 +151,13 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "\"column0\",\"column1\"\n" +
-                                               "\"row0cell0\",\"row0cell1\"\n" +
-                                               "\"row1cell0\",\"row1cell1\"\n");
+                "\"row0cell0\",\"row0cell1\"\n" +
+                "\"row1cell0\",\"row1cell1\"\n");
     }
 
     @Test
-    public void exportCsvWithLineBreaks(){
-        CreateGrid(3,3);
+    public void exportCsvWithLineBreaks() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("line\n\n\nbreak", null));
         try {
@@ -167,14 +167,14 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
-                                               "row0cell0,row0cell1,row0cell2\n" +
-                                               "row1cell0,\"line\n\n\nbreak\",row1cell2\n" +
-                                               "row2cell0,row2cell1,row2cell2\n");
+                "row0cell0,row0cell1,row0cell2\n" +
+                "row1cell0,\"line\n\n\nbreak\",row1cell2\n" +
+                "row2cell0,row2cell1,row2cell2\n");
     }
 
     @Test
-    public void exportCsvWithComma(){
-        CreateGrid(3,3);
+    public void exportCsvWithComma() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("with, comma", null));
         try {
@@ -184,14 +184,14 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
-                                               "row0cell0,row0cell1,row0cell2\n" +
-                                               "row1cell0,\"with, comma\",row1cell2\n" +
-                                               "row2cell0,row2cell1,row2cell2\n");
+                "row0cell0,row0cell1,row0cell2\n" +
+                "row1cell0,\"with, comma\",row1cell2\n" +
+                "row2cell0,row2cell1,row2cell2\n");
     }
 
     @Test
-    public void exportCsvWithQuote(){
-        CreateGrid(3,3);
+    public void exportCsvWithQuote() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("line has \"quote\"", null));
         try {
@@ -201,14 +201,14 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
-                                               "row0cell0,row0cell1,row0cell2\n" +
-                                               "row1cell0,\"line has \"\"quote\"\"\",row1cell2\n" +
-                                               "row2cell0,row2cell1,row2cell2\n");
+                "row0cell0,row0cell1,row0cell2\n" +
+                "row1cell0,\"line has \"\"quote\"\"\",row1cell2\n" +
+                "row2cell0,row2cell1,row2cell2\n");
     }
 
     @Test
-    public void exportCsvWithEmptyCells(){
-        CreateGrid(3,3);
+    public void exportCsvWithEmptyCells() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, null);
         project.rows.get(2).cells.set(0, null);
@@ -219,40 +219,31 @@ public class CsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
-                                               "row0cell0,row0cell1,row0cell2\n" +
-                                               "row1cell0,,row1cell2\n" +
-                                               ",row2cell1,row2cell2\n");
+                "row0cell0,row0cell1,row0cell2\n" +
+                "row1cell0,,row1cell2\n" +
+                ",row2cell1,row2cell2\n");
     }
-    
-    // all date type cells are in unified format   
+
+    // all date type cells are in unified format
     /**
-    @Ignore
-    @Test
-    public void exportDateColumnsPreVersion28(){
-        CreateGrid(1,2);
-        Calendar calendar = Calendar.getInstance();
-        Date date = new Date();
+     * @Ignore
+     * @Test public void exportDateColumnsPreVersion28(){ CreateGrid(1,2); Calendar calendar = Calendar.getInstance();
+     *       Date date = new Date();
+     * 
+     *       when(options.getProperty("printColumnHeader")).thenReturn("false"); project.rows.get(0).cells.set(0, new
+     *       Cell(calendar, null)); project.rows.get(0).cells.set(1, new Cell(date, null));
+     * 
+     *       try { SUT.export(project, options, engine, writer); } catch (IOException e) { Assert.fail(); }
+     * 
+     *       String expectedOutput = ParsingUtilities.instantToLocalDateTimeString(calendar.toInstant()) + "," +
+     *       ParsingUtilities.instantToLocalDateTimeString(date.toInstant()) + "\n";
+     * 
+     *       Assert.assertEquals(writer.toString(), expectedOutput); }
+     */
+    // helper methods
 
-        when(options.getProperty("printColumnHeader")).thenReturn("false");
-        project.rows.get(0).cells.set(0, new Cell(calendar, null));
-        project.rows.get(0).cells.set(1, new Cell(date, null));
-
-        try {
-            SUT.export(project, options, engine, writer);
-        } catch (IOException e) {
-            Assert.fail();
-        }
-
-        String expectedOutput = ParsingUtilities.instantToLocalDateTimeString(calendar.toInstant()) + "," +
-            ParsingUtilities.instantToLocalDateTimeString(date.toInstant()) + "\n";
-
-        Assert.assertEquals(writer.toString(), expectedOutput);
-    }
-    */
-    //helper methods
-
-    protected void CreateColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+    protected void CreateColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -261,12 +252,12 @@ public class CsvExporterTests extends RefineTest {
         }
     }
 
-    protected void CreateGrid(int noOfRows, int noOfColumns){
+    protected void CreateGrid(int noOfRows, int noOfColumns) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java
index b5bb202bf..8ecc33e46 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/HtmlExporterTests.java
@@ -70,18 +70,18 @@ public class HtmlExporterTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     StringWriter writer;
     ProjectMetadata projectMetadata;
     Project project;
     Engine engine;
     Properties options;
 
-    //System Under Test
+    // System Under Test
     WriterExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new HtmlTableExporter();
         writer = new StringWriter();
         ProjectManager.singleton = new ProjectManagerStub();
@@ -94,7 +94,7 @@ public class HtmlExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         writer = null;
         ProjectManager.singleton.deleteProject(project.id);
@@ -105,7 +105,7 @@ public class HtmlExporterTests extends RefineTest {
     }
 
     @Test
-    public void exportSimpleHtmlTable(){
+    public void exportSimpleHtmlTable() {
         CreateGrid(2, 2);
 
         try {
@@ -115,8 +115,8 @@ public class HtmlExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "<html>\n" +
-                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" + 
-                "<meta charset=\"utf-8\" />\n" + 
+                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" +
+                "<meta charset=\"utf-8\" />\n" +
                 "</head>\n" +
                 "<body>\n" +
                 "<table>\n" +
@@ -125,14 +125,14 @@ public class HtmlExporterTests extends RefineTest {
                 "<tr><td>row1cell0</td><td>row1cell1</td></tr>\n" +
                 "</table>\n" +
                 "</body>\n" +
-        "</html>\n");
-        
+                "</html>\n");
+
     }
 
-    // TODO: This test fails because the HTML table exporter 
-    // apparently doesn't honor the column header option.  Should it?
-    @Test(enabled=false)
-    public void exportSimpleHtmlTableNoHeader(){
+    // TODO: This test fails because the HTML table exporter
+    // apparently doesn't honor the column header option. Should it?
+    @Test(enabled = false)
+    public void exportSimpleHtmlTableNoHeader() {
         CreateGrid(2, 2);
         when(options.getProperty("printColumnHeader")).thenReturn("false");
         try {
@@ -142,8 +142,8 @@ public class HtmlExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "<html>\n" +
-                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" + 
-                "<meta charset=\"utf-8\" />\n" + 
+                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" +
+                "<meta charset=\"utf-8\" />\n" +
                 "</head>\n" +
                 "<body>\n" +
                 "<table>\n" +
@@ -152,13 +152,12 @@ public class HtmlExporterTests extends RefineTest {
                 "</table>\n" +
                 "</body>\n" +
                 "</html>\n");
-        verify(options,times(2)).getProperty("printColumnHeader");
+        verify(options, times(2)).getProperty("printColumnHeader");
     }
 
-
     @Test
-    public void exportHtmlTableWithEmptyCells(){
-        CreateGrid(3,3);
+    public void exportHtmlTableWithEmptyCells() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, null);
         project.rows.get(2).cells.set(0, null);
@@ -169,7 +168,7 @@ public class HtmlExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "<html>\n" +
-                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" + 
+                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" +
                 "<meta charset=\"utf-8\" />\n" +
                 "</head>\n" +
                 "<body>\n" +
@@ -181,11 +180,11 @@ public class HtmlExporterTests extends RefineTest {
                 "</table>\n" +
                 "</body>\n" +
                 "</html>\n");
-        }
-    
+    }
+
     @Test
-    public void exportHtmlTableWithURLs(){
-        CreateGrid(3,3);
+    public void exportHtmlTableWithURLs() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("ftp://ftp.ripe.net/ripe/", null));
         project.rows.get(2).cells.set(0, new Cell("https://gnu.org/", null));
@@ -196,24 +195,25 @@ public class HtmlExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "<html>\n" +
-                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" + 
+                "<head>\n" + "<title>" + TEST_PROJECT_NAME + "</title>\n" +
                 "<meta charset=\"utf-8\" />\n" +
                 "</head>\n" +
                 "<body>\n" +
                 "<table>\n" +
                 "<tr><th>column0</th><th>column1</th><th>column2</th></tr>\n" +
                 "<tr><td>row0cell0</td><td>row0cell1</td><td>row0cell2</td></tr>\n" +
-                "<tr><td>row1cell0</td><td><a href=\"ftp://ftp.ripe.net/ripe/\">ftp://ftp.ripe.net/ripe/</a></td><td>row1cell2</td></tr>\n" +
+                "<tr><td>row1cell0</td><td><a href=\"ftp://ftp.ripe.net/ripe/\">ftp://ftp.ripe.net/ripe/</a></td><td>row1cell2</td></tr>\n"
+                +
                 "<tr><td><a href=\"https://gnu.org/\">https://gnu.org/</a></td><td>row2cell1</td><td>row2cell2</td></tr>\n" +
                 "</table>\n" +
                 "</body>\n" +
                 "</html>\n");
     }
 
-    //helper methods
+    // helper methods
 
-    protected void CreateColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+    protected void CreateColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -222,12 +222,12 @@ public class HtmlExporterTests extends RefineTest {
         }
     }
 
-    protected void CreateGrid(int noOfRows, int noOfColumns){
+    protected void CreateGrid(int noOfRows, int noOfColumns) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java
index 57819ed02..bb8df0f3a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/TemplatingExporterTests.java
@@ -52,6 +52,7 @@ import com.google.refine.ProjectManagerStub;
 import com.google.refine.ProjectMetadata;
 import com.google.refine.RefineTest;
 import com.google.refine.browsing.Engine;
+import com.google.refine.browsing.Engine.Mode;
 import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
@@ -74,18 +75,18 @@ public class TemplatingExporterTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     StringWriter writer;
     ProjectMetadata projectMetadata;
     Project project;
     Engine engine;
     Properties options;
 
-    //System Under Test
+    // System Under Test
     WriterExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new TemplatingExporter();
         writer = new StringWriter();
         ProjectManager.singleton = new ProjectManagerStub();
@@ -98,7 +99,7 @@ public class TemplatingExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         writer = null;
         ProjectManager.singleton.deleteProject(project.id);
@@ -106,8 +107,9 @@ public class TemplatingExporterTests extends RefineTest {
         engine = null;
         options = null;
     }
+
     @Test
-    public void exportEmptyTemplate(){
+    public void exportEmptyTemplate() {
 
 //        when(options.getProperty("limit")).thenReturn("100"); // optional integer
 //        when(options.getProperty("sorting")).thenReturn(""); //optional
@@ -125,14 +127,13 @@ public class TemplatingExporterTests extends RefineTest {
 
         Assert.assertEquals(writer.toString(), prefix + suffix);
     }
-    
+
     @Test
-    public void exportSimpleTemplate(){
+    public void exportSimpleTemplate() {
         CreateGrid(2, 2);
         String template = rowPrefix + "${column0}" + cellSeparator + "${column1}";
 //      String template = "boilerplate${column0}{{4+3}}${column1}";
 
-        
 //        when(options.getProperty("limit")).thenReturn("100"); // optional integer
 //        when(options.getProperty("sorting")).thenReturn(""); //optional
         when(options.getProperty("template")).thenReturn(template);
@@ -147,26 +148,26 @@ public class TemplatingExporterTests extends RefineTest {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), 
-                prefix 
-                + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + rowSeparator
-                + rowPrefix + "row1cell0" + cellSeparator + "row1cell1" 
-                + suffix);
+        Assert.assertEquals(writer.toString(),
+                prefix
+                        + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + rowSeparator
+                        + rowPrefix + "row1cell0" + cellSeparator + "row1cell1"
+                        + suffix);
     }
 
-
     @Test()
-    public void exportTemplateWithEmptyCells(){
-        
+    public void exportTemplateWithEmptyCells() {
+
 //      when(options.getProperty("limit")).thenReturn("100"); // optional integer
 //      when(options.getProperty("sorting")).thenReturn(""); //optional
-      when(options.getProperty("template")).thenReturn(rowPrefix + "${column0}" + cellSeparator + "${column1}" + cellSeparator + "${column2}");
-      when(options.getProperty("prefix")).thenReturn(prefix);
-      when(options.getProperty("suffix")).thenReturn(suffix);
-      when(options.getProperty("separator")).thenReturn(rowSeparator);
+        when(options.getProperty("template"))
+                .thenReturn(rowPrefix + "${column0}" + cellSeparator + "${column1}" + cellSeparator + "${column2}");
+        when(options.getProperty("prefix")).thenReturn(prefix);
+        when(options.getProperty("suffix")).thenReturn(suffix);
+        when(options.getProperty("separator")).thenReturn(rowSeparator);
 //      when(options.getProperty("preview")).thenReturn("false"); // optional true|false
 
-        CreateGrid(3,3);
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, null);
         project.rows.get(2).cells.set(0, null);
@@ -177,27 +178,28 @@ public class TemplatingExporterTests extends RefineTest {
         }
 
         // Template exporter returns null for empty cells
-        Assert.assertEquals(writer.toString(), 
-                prefix 
-                + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + cellSeparator + "row0cell2" + rowSeparator
-                + rowPrefix + "row1cell0" + cellSeparator + "null"    + cellSeparator + "row1cell2" + rowSeparator 
-                + rowPrefix + "null"      + cellSeparator + "row2cell1" + cellSeparator + "row2cell2" 
-                + suffix);
+        Assert.assertEquals(writer.toString(),
+                prefix
+                        + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + cellSeparator + "row0cell2" + rowSeparator
+                        + rowPrefix + "row1cell0" + cellSeparator + "null" + cellSeparator + "row1cell2" + rowSeparator
+                        + rowPrefix + "null" + cellSeparator + "row2cell1" + cellSeparator + "row2cell2"
+                        + suffix);
 
     }
 
     @Test()
-    public void exportTemplateWithLimit(){
-        
-      when(options.getProperty("limit")).thenReturn("2"); // optional integer
+    public void exportTemplateWithLimit() {
+
+        when(options.getProperty("limit")).thenReturn("2"); // optional integer
 //      when(options.getProperty("sorting")).thenReturn(""); //optional
-      when(options.getProperty("template")).thenReturn(rowPrefix + "${column0}" + cellSeparator + "${column1}" + cellSeparator + "${column2}");
-      when(options.getProperty("prefix")).thenReturn(prefix);
-      when(options.getProperty("suffix")).thenReturn(suffix);
-      when(options.getProperty("separator")).thenReturn(rowSeparator);
+        when(options.getProperty("template"))
+                .thenReturn(rowPrefix + "${column0}" + cellSeparator + "${column1}" + cellSeparator + "${column2}");
+        when(options.getProperty("prefix")).thenReturn(prefix);
+        when(options.getProperty("suffix")).thenReturn(suffix);
+        when(options.getProperty("separator")).thenReturn(rowSeparator);
 //      when(options.getProperty("preview")).thenReturn("false"); // optional true|false
 
-        CreateGrid(3,3);
+        CreateGrid(3, 3);
 
         try {
             SUT.export(project, options, engine, writer);
@@ -205,19 +207,58 @@ public class TemplatingExporterTests extends RefineTest {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), 
-                prefix 
-                + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + cellSeparator + "row0cell2" + rowSeparator
-                + rowPrefix + "row1cell0" + cellSeparator + "row1cell1" + cellSeparator + "row1cell2"  
-                // third row should be skipped because of limit
-                + suffix);
+        Assert.assertEquals(writer.toString(),
+                prefix
+                        + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + cellSeparator + "row0cell2" + rowSeparator
+                        + rowPrefix + "row1cell0" + cellSeparator + "row1cell1" + cellSeparator + "row1cell2"
+                        // third row should be skipped because of limit
+                        + suffix);
 
     }
-    
-    //helper methods
 
-    protected void CreateColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+    /**
+     * This test is add for checking the fix for issue 3955. Issue link:
+     * https://github.com/OpenRefine/OpenRefine/issues/3955
+     */
+    @Test
+    public void exportTemplateInRecordMode() {
+        CreateColumns(2);
+        for (int i = 0; i < 2; i++) {
+            Row row = new Row(2);
+            for (int j = 0; j < 2; j++) {
+                if (i == 1 && j == 0) {
+                    row.cells.add(new Cell(null, null));
+                } else {
+                    row.cells.add(new Cell("row" + i + "cell" + j, null));
+                }
+            }
+            project.rows.add(row);
+        }
+        String template = rowPrefix + "${column0}" + cellSeparator + "${column1}";
+        when(options.getProperty("template")).thenReturn(template);
+        when(options.getProperty("prefix")).thenReturn(prefix);
+        when(options.getProperty("suffix")).thenReturn(suffix);
+        when(options.getProperty("separator")).thenReturn(rowSeparator);
+        Engine engine = new Engine(project);
+        engine.setMode(Mode.RecordBased);
+        project.update();
+        try {
+            SUT.export(project, options, engine, writer);
+        } catch (IOException e) {
+            Assert.fail();
+        }
+
+        Assert.assertEquals(writer.toString(),
+                prefix
+                        + rowPrefix + "row0cell0" + cellSeparator + "row0cell1" + rowSeparator
+                        + rowPrefix + "null" + cellSeparator + "row1cell1"
+                        + suffix);
+    }
+
+    // helper methods
+
+    protected void CreateColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -226,12 +267,12 @@ public class TemplatingExporterTests extends RefineTest {
         }
     }
 
-    protected void CreateGrid(int noOfRows, int noOfColumns){
+    protected void CreateGrid(int noOfRows, int noOfColumns) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java
index bd27ec8c3..ef5d8a16a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/TsvExporterTests.java
@@ -65,18 +65,18 @@ public class TsvExporterTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     StringWriter writer;
     Project project;
     Engine engine;
     Properties options;
 
-    //System Under Test
+    // System Under Test
     CsvExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
-        SUT = new CsvExporter('\t');//new TsvExporter();
+    public void SetUp() {
+        SUT = new CsvExporter('\t');// new TsvExporter();
         writer = new StringWriter();
         project = new Project();
         engine = new Engine(project);
@@ -84,7 +84,7 @@ public class TsvExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         writer = null;
         project = null;
@@ -93,7 +93,7 @@ public class TsvExporterTests extends RefineTest {
     }
 
     @Test
-    public void exportSimpleTsv(){
+    public void exportSimpleTsv() {
         CreateGrid(2, 2);
 
         try {
@@ -103,13 +103,13 @@ public class TsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0\tcolumn1\n" +
-                                               "row0cell0\trow0cell1\n" +
-                                               "row1cell0\trow1cell1\n");
+                "row0cell0\trow0cell1\n" +
+                "row1cell0\trow1cell1\n");
 
     }
 
     @Test
-    public void exportSimpleTsvNoHeader(){
+    public void exportSimpleTsvNoHeader() {
         CreateGrid(2, 2);
         when(options.getProperty("printColumnHeader")).thenReturn("false");
         try {
@@ -119,14 +119,14 @@ public class TsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "row0cell0\trow0cell1\n" +
-                                               "row1cell0\trow1cell1\n");
+                "row1cell0\trow1cell1\n");
 
-        verify(options,times(2)).getProperty("printColumnHeader");
+        verify(options, times(2)).getProperty("printColumnHeader");
     }
 
     @Test
-    public void exportTsvWithLineBreaks(){
-        CreateGrid(3,3);
+    public void exportTsvWithLineBreaks() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("line\n\n\nbreak", null));
         try {
@@ -136,14 +136,14 @@ public class TsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
-                                               "row0cell0\trow0cell1\trow0cell2\n" +
-                                               "row1cell0\t\"line\n\n\nbreak\"\trow1cell2\n" +
-                                               "row2cell0\trow2cell1\trow2cell2\n");
+                "row0cell0\trow0cell1\trow0cell2\n" +
+                "row1cell0\t\"line\n\n\nbreak\"\trow1cell2\n" +
+                "row2cell0\trow2cell1\trow2cell2\n");
     }
 
     @Test
-    public void exportTsvWithComma(){
-        CreateGrid(3,3);
+    public void exportTsvWithComma() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("with\t tab", null));
         try {
@@ -153,14 +153,14 @@ public class TsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
-                                               "row0cell0\trow0cell1\trow0cell2\n" +
-                                               "row1cell0\t\"with\t tab\"\trow1cell2\n" +
-                                               "row2cell0\trow2cell1\trow2cell2\n");
+                "row0cell0\trow0cell1\trow0cell2\n" +
+                "row1cell0\t\"with\t tab\"\trow1cell2\n" +
+                "row2cell0\trow2cell1\trow2cell2\n");
     }
 
     @Test
-    public void exportTsvWithQuote(){
-        CreateGrid(3,3);
+    public void exportTsvWithQuote() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, new Cell("line has \"quote\"", null));
         try {
@@ -170,14 +170,14 @@ public class TsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
-                                               "row0cell0\trow0cell1\trow0cell2\n" +
-                                               "row1cell0\t\"line has \"\"quote\"\"\"\trow1cell2\n" +
-                                               "row2cell0\trow2cell1\trow2cell2\n");
+                "row0cell0\trow0cell1\trow0cell2\n" +
+                "row1cell0\t\"line has \"\"quote\"\"\"\trow1cell2\n" +
+                "row2cell0\trow2cell1\trow2cell2\n");
     }
 
     @Test
-    public void exportTsvWithEmptyCells(){
-        CreateGrid(3,3);
+    public void exportTsvWithEmptyCells() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, null);
         project.rows.get(2).cells.set(0, null);
@@ -188,15 +188,15 @@ public class TsvExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
-                                               "row0cell0\trow0cell1\trow0cell2\n" +
-                                               "row1cell0\t\trow1cell2\n" +
-                                               "\trow2cell1\trow2cell2\n");
+                "row0cell0\trow0cell1\trow0cell2\n" +
+                "row1cell0\t\trow1cell2\n" +
+                "\trow2cell1\trow2cell2\n");
     }
 
-    //helper methods
+    // helper methods
 
-    protected void CreateColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+    protected void CreateColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
                 project.columnModel.columns.get(i).getCellIndex();
@@ -206,16 +206,15 @@ public class TsvExporterTests extends RefineTest {
         }
     }
 
-    protected void CreateGrid(int noOfRows, int noOfColumns){
+    protected void CreateGrid(int noOfRows, int noOfColumns) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
         }
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java
index 6b04c8521..f94041a11 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsExporterTests.java
@@ -67,25 +67,25 @@ import com.google.refine.model.Row;
 public class XlsExporterTests extends RefineTest {
 
     private static final String TEST_PROJECT_NAME = "xls exporter test project";
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     ByteArrayOutputStream stream;
     ProjectMetadata projectMetadata;
     Project project;
     Engine engine;
     Properties options;
 
-    //System Under Test
+    // System Under Test
     StreamExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new XlsExporter(false);
         stream = new ByteArrayOutputStream();
         ProjectManager.singleton = new ProjectManagerStub();
@@ -98,7 +98,7 @@ public class XlsExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         stream = null;
         ProjectManager.singleton.deleteProject(project.id);
@@ -108,13 +108,13 @@ public class XlsExporterTests extends RefineTest {
     }
 
     @Test
-    public void getContentType(){
+    public void getContentType() {
         Assert.assertEquals(SUT.getContentType(), "application/vnd.ms-excel");
     }
 
     @Test
-    public void getSpreadsheetVersion(){
-        XlsExporter exporter = (XlsExporter)SUT;
+    public void getSpreadsheetVersion() {
+        XlsExporter exporter = (XlsExporter) SUT;
         Assert.assertEquals(exporter.getSpreadsheetVersion(), SpreadsheetVersion.EXCEL97);
     }
 
@@ -128,13 +128,13 @@ public class XlsExporterTests extends RefineTest {
             Assert.fail();
         }
 
-        Assert.assertEquals(stream.size(),4096);
+        Assert.assertEquals(stream.size(), 4096);
 
         try (HSSFWorkbook wb = new HSSFWorkbook(new ByteArrayInputStream(stream.toByteArray()))) {
             org.apache.poi.ss.usermodel.Sheet ws = wb.getSheetAt(0);
             org.apache.poi.ss.usermodel.Row row1 = ws.getRow(1);
             org.apache.poi.ss.usermodel.Cell cell0 = row1.getCell(0);
-            Assert.assertEquals(cell0.toString(),"row0cell0");
+            Assert.assertEquals(cell0.toString(), "row0cell0");
         }
     }
 
@@ -152,7 +152,7 @@ public class XlsExporterTests extends RefineTest {
             org.apache.poi.ss.usermodel.Sheet ws = wb.getSheetAt(0);
             org.apache.poi.ss.usermodel.Row row1 = ws.getRow(1);
             org.apache.poi.ss.usermodel.Cell cell0 = row1.getCell(255);
-            Assert.assertEquals(cell0.toString(),"row0cell255");
+            Assert.assertEquals(cell0.toString(), "row0cell255");
         }
     }
 
@@ -171,13 +171,13 @@ public class XlsExporterTests extends RefineTest {
             org.apache.poi.ss.usermodel.Row row1 = ws.getRow(1);
             org.apache.poi.ss.usermodel.Cell cell0 = row1.getCell(255);
             // FIXME: This is not a good error reporting mechanism, but it's what there today
-            Assert.assertEquals(cell0.toString(),"ERROR: TOO MANY COLUMNS");
+            Assert.assertEquals(cell0.toString(), "ERROR: TOO MANY COLUMNS");
         }
     }
 
     @Test
-    public void exportDateType() throws IOException{
-        OffsetDateTime odt =  OffsetDateTime.parse("2019-04-09T12:00+00:00");
+    public void exportDateType() throws IOException {
+        OffsetDateTime odt = OffsetDateTime.parse("2019-04-09T12:00+00:00");
         createDateGrid(2, 2, odt);
 
         try {
@@ -186,7 +186,7 @@ public class XlsExporterTests extends RefineTest {
             Assert.fail();
         }
 
-        Assert.assertEquals(stream.size(),4096);
+        Assert.assertEquals(stream.size(), 4096);
 
         try (HSSFWorkbook wb = new HSSFWorkbook(new ByteArrayInputStream(stream.toByteArray()))) {
             org.apache.poi.ss.usermodel.Sheet ws = wb.getSheetAt(0);
@@ -196,7 +196,7 @@ public class XlsExporterTests extends RefineTest {
         }
     }
 
-    public void exportSimpleXlsNoHeader(){
+    public void exportSimpleXlsNoHeader() {
         CreateGrid(2, 2);
         when(options.getProperty("printColumnHeader")).thenReturn("false");
         try {
@@ -206,14 +206,13 @@ public class XlsExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(stream.toString(), "row0cell0,row0cell1\n" +
-                                               "row1cell0,row1cell1\n");
+                "row1cell0,row1cell1\n");
 
-        verify(options,times(2)).getProperty("printColumnHeader");
+        verify(options, times(2)).getProperty("printColumnHeader");
     }
 
-
-    public void exportXlsWithEmptyCells(){
-        CreateGrid(3,3);
+    public void exportXlsWithEmptyCells() {
+        CreateGrid(3, 3);
 
         project.rows.get(1).cells.set(1, null);
         project.rows.get(2).cells.set(0, null);
@@ -224,15 +223,15 @@ public class XlsExporterTests extends RefineTest {
         }
 
         Assert.assertEquals(stream.toString(), "column0,column1,column2\n" +
-                                               "row0cell0,row0cell1,row0cell2\n" +
-                                               "row1cell0,,row1cell2\n" +
-                                               ",row2cell1,row2cell2\n");
+                "row0cell0,row0cell1,row0cell2\n" +
+                "row1cell0,,row1cell2\n" +
+                ",row2cell1,row2cell2\n");
     }
 
-    //helper methods
+    // helper methods
 
-    protected void CreateColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+    protected void CreateColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -241,24 +240,24 @@ public class XlsExporterTests extends RefineTest {
         }
     }
 
-    protected void CreateGrid(int noOfRows, int noOfColumns){
+    protected void CreateGrid(int noOfRows, int noOfColumns) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
         }
     }
-    
-    private void createDateGrid(int noOfRows, int noOfColumns, OffsetDateTime now){
+
+    private void createDateGrid(int noOfRows, int noOfColumns, OffsetDateTime now) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell(now, null));
             }
             project.rows.add(row);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java
index bad83267e..12256ca0c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/XlsxExporterTests.java
@@ -70,25 +70,25 @@ import com.google.refine.model.Row;
 public class XlsxExporterTests extends RefineTest {
 
     private static final String TEST_PROJECT_NAME = "xlsx exporter test project";
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     ByteArrayOutputStream stream;
     ProjectMetadata projectMetadata;
     Project project;
     Engine engine;
     Properties options;
 
-    //System Under Test
+    // System Under Test
     StreamExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new XlsExporter(true);
         stream = new ByteArrayOutputStream();
         ProjectManager.singleton = new ProjectManagerStub();
@@ -101,7 +101,7 @@ public class XlsxExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         stream = null;
         ProjectManager.singleton.deleteProject(project.id);
@@ -111,18 +111,18 @@ public class XlsxExporterTests extends RefineTest {
     }
 
     @Test
-    public void getContentType(){
+    public void getContentType() {
         Assert.assertEquals(SUT.getContentType(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
     }
 
     @Test
-    public void getSpreadsheetVersion(){
-        XlsExporter exporter = (XlsExporter)SUT;
+    public void getSpreadsheetVersion() {
+        XlsExporter exporter = (XlsExporter) SUT;
         Assert.assertEquals(exporter.getSpreadsheetVersion(), SpreadsheetVersion.EXCEL2007);
     }
 
     @Test
-    public void exportSimpleXlsx(){
+    public void exportSimpleXlsx() {
         CreateGrid(2, 2);
 
         try {
@@ -131,22 +131,22 @@ public class XlsxExporterTests extends RefineTest {
             Assert.fail();
         }
 
-        ByteArrayInputStream inStream = new ByteArrayInputStream( stream.toByteArray() );
+        ByteArrayInputStream inStream = new ByteArrayInputStream(stream.toByteArray());
         try {
             XSSFWorkbook wb = new XSSFWorkbook(inStream);
             XSSFSheet ws = wb.getSheetAt(0);
             XSSFRow row1 = ws.getRow(1);
             XSSFCell cell0 = row1.getCell(0);
-            Assert.assertEquals(cell0.toString(),"row0cell0");
+            Assert.assertEquals(cell0.toString(), "row0cell0");
             wb.close();
         } catch (IOException e) {
             Assert.fail();
         }
     }
-    
+
     @Test
-    public void exportXlsxDateType() throws IOException{
-        OffsetDateTime odt =  OffsetDateTime.parse("2019-04-09T12:00+00:00");
+    public void exportXlsxDateType() throws IOException {
+        OffsetDateTime odt = OffsetDateTime.parse("2019-04-09T12:00+00:00");
         createDateGrid(2, 2, odt);
 
         try {
@@ -154,8 +154,8 @@ public class XlsxExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
-        ByteArrayInputStream inStream = new ByteArrayInputStream( stream.toByteArray() );
+
+        ByteArrayInputStream inStream = new ByteArrayInputStream(stream.toByteArray());
         try {
             XSSFWorkbook wb = new XSSFWorkbook(inStream);
             XSSFSheet ws = wb.getSheetAt(0);
@@ -167,9 +167,9 @@ public class XlsxExporterTests extends RefineTest {
             Assert.fail();
         }
     }
-    
+
     @Test
-    public void exportXlsxStringWithURLs() throws IOException{
+    public void exportXlsxStringWithURLs() throws IOException {
         String url = "GET /primo-library/,http:%2F%2Fcatalogue.unice.fr HTTP/1.1";
         createDateGrid(2, 2, url);
 
@@ -178,8 +178,8 @@ public class XlsxExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
-        ByteArrayInputStream inStream = new ByteArrayInputStream( stream.toByteArray() );
+
+        ByteArrayInputStream inStream = new ByteArrayInputStream(stream.toByteArray());
         try {
             XSSFWorkbook wb = new XSSFWorkbook(inStream);
             XSSFSheet ws = wb.getSheetAt(0);
@@ -206,7 +206,7 @@ public class XlsxExporterTests extends RefineTest {
             org.apache.poi.ss.usermodel.Sheet ws = wb.getSheetAt(0);
             org.apache.poi.ss.usermodel.Row row1 = ws.getRow(1);
             org.apache.poi.ss.usermodel.Cell cell0 = row1.getCell(256);
-            Assert.assertEquals(cell0.toString(),"row0cell256");
+            Assert.assertEquals(cell0.toString(), "row0cell256");
         }
     }
 
@@ -224,14 +224,14 @@ public class XlsxExporterTests extends RefineTest {
             org.apache.poi.ss.usermodel.Sheet ws = wb.getSheetAt(0);
             org.apache.poi.ss.usermodel.Row row1 = ws.getRow(1);
             org.apache.poi.ss.usermodel.Cell cell0 = row1.getCell(9999);
-            Assert.assertEquals(cell0.toString(),"row0cell9999");
+            Assert.assertEquals(cell0.toString(), "row0cell9999");
         }
     }
 
-    //helper methods
+    // helper methods
 
-    protected void CreateColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+    protected void CreateColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -240,24 +240,24 @@ public class XlsxExporterTests extends RefineTest {
         }
     }
 
-    protected void CreateGrid(int noOfRows, int noOfColumns){
+    protected void CreateGrid(int noOfRows, int noOfColumns) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
         }
     }
-    
-    private void createDateGrid(int noOfRows, int noOfColumns, Serializable value){
+
+    private void createDateGrid(int noOfRows, int noOfColumns, Serializable value) {
         CreateColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell(value, null));
             }
             project.rows.add(row);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java
index 592b00b20..5c856928a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java
@@ -71,9 +71,8 @@ import com.google.refine.model.Project;
 import com.google.refine.model.Row;
 import com.google.refine.util.ParsingUtilities;
 
-
 public class SqlExporterTests extends RefineTest {
-    
+
     private static final String TEST_PROJECT_NAME = "SQL_EXPORTER_TEST_PROJECT";
 
     @Override
@@ -82,7 +81,7 @@ public class SqlExporterTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     StringWriter writer;
     ProjectMetadata projectMetadata;
     Project project;
@@ -91,11 +90,11 @@ public class SqlExporterTests extends RefineTest {
     SqlCreateBuilder sqlCreateBuilder;
     SqlInsertBuilder sqlInsertBuilder;
 
-    //System Under Test
+    // System Under Test
     SqlExporter SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new SqlExporter();
         writer = new StringWriter();
         ProjectManager.singleton = new ProjectManagerStub();
@@ -108,7 +107,7 @@ public class SqlExporterTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         writer = null;
         ProjectManager.singleton.deleteProject(project.id);
@@ -119,12 +118,12 @@ public class SqlExporterTests extends RefineTest {
         sqlCreateBuilder = null;
         sqlInsertBuilder = null;
     }
-    
+
     @Test
-    public void testExportSqlWithNonZeroScaleNumericValue(){
+    public void testExportSqlWithNonZeroScaleNumericValue() {
         createNonZeroScaleNumericGrid(2, 2);
         String tableName = "sql_table_test";
-        String optionsString = createOptionsFromProject(tableName, SqlData.SQL_TYPE_NUMERIC,null).toString();
+        String optionsString = createOptionsFromProject(tableName, SqlData.SQL_TYPE_NUMERIC, null).toString();
         when(options.getProperty("options")).thenReturn(optionsString);
 
         try {
@@ -132,32 +131,32 @@ public class SqlExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
         logger.debug("result = \n" + result);
         Assert.assertNotNull(result);
         assertNotEquals(writer.toString(), SqlExporter.NO_OPTIONS_PRESENT_ERROR);
         boolean checkResult = result.contains("CREATE TABLE " + tableName);
         checkResult = result.contains("INSERT INTO " + tableName);
-        Assert.assertEquals(checkResult,  true);
-   
+        Assert.assertEquals(checkResult, true);
+
     }
 
     private void createNonZeroScaleNumericGrid(int noOfRows, int noOfColumns) {
         createColumnsWithScaleEqualsTwo(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
-                row.cells.add(new Cell(generateRandomNumericValues() , null));
+            for (int j = 0; j < noOfColumns; j++) {
+                row.cells.add(new Cell(generateRandomNumericValues(), null));
             }
             project.rows.add(row);
         }
-        
+
     }
-    
-    protected void createColumnsWithScaleEqualsTwo(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+
+    protected void createColumnsWithScaleEqualsTwo(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -167,10 +166,10 @@ public class SqlExporterTests extends RefineTest {
     }
 
     @Test
-    public void testExportSimpleSql(){
+    public void testExportSimpleSql() {
         createGrid(2, 2);
         String tableName = "sql_table_test";
-        String optionsString = createOptionsFromProject(tableName, null,null).toString();
+        String optionsString = createOptionsFromProject(tableName, null, null).toString();
         when(options.getProperty("options")).thenReturn(optionsString);
 
         try {
@@ -178,20 +177,20 @@ public class SqlExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
 
         Assert.assertNotNull(result);
         assertNotEquals(writer.toString(), SqlExporter.NO_OPTIONS_PRESENT_ERROR);
         Assert.assertTrue(result.contains("INSERT INTO " + tableName));
-   
+
     }
-    
+
     @Test
-    public void testExportSqlNoSchema(){
+    public void testExportSqlNoSchema() {
         createGrid(2, 2);
         String tableName = "sql_table_test";
-        ObjectNode optionsJson = (ObjectNode) createOptionsFromProject(tableName, null,null);
+        ObjectNode optionsJson = (ObjectNode) createOptionsFromProject(tableName, null, null);
         optionsJson.put("includeStructure", false);
         when(options.getProperty("options")).thenReturn(optionsJson.toString());
 
@@ -200,20 +199,20 @@ public class SqlExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
         Assert.assertNotNull(result);
         assertNotEquals(writer.toString(), SqlExporter.NO_OPTIONS_PRESENT_ERROR);
         boolean checkResult = result.contains("CREATE TABLE " + tableName);
-        Assert.assertEquals(checkResult,  false);
-       
+        Assert.assertEquals(checkResult, false);
+
         checkResult = result.contains("INSERT INTO " + tableName);
-        Assert.assertEquals(checkResult,  true);
-   
+        Assert.assertEquals(checkResult, true);
+
     }
-    
+
     @Test
-    public void testExportSqlNoContent(){
+    public void testExportSqlNoContent() {
         createGrid(2, 2);
         String tableName = "sql_table_test";
         ObjectNode optionsJson = (ObjectNode) createOptionsFromProject(tableName, null, null);
@@ -225,26 +224,26 @@ public class SqlExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
         Assert.assertNotNull(result);
         assertNotEquals(writer.toString(), SqlExporter.NO_OPTIONS_PRESENT_ERROR);
         boolean checkResult = result.contains("CREATE TABLE " + tableName);
-        Assert.assertEquals(checkResult,  true);
-       
+        Assert.assertEquals(checkResult, true);
+
         checkResult = result.contains("INSERT INTO " + tableName);
-        Assert.assertEquals(checkResult,  false);
-   
+        Assert.assertEquals(checkResult, false);
+
     }
-    
+
     @Test
-    public void testExportSqlIncludeSchemaWithDropStmt(){
+    public void testExportSqlIncludeSchemaWithDropStmt() {
         createGrid(2, 2);
         String tableName = "sql_table_test";
         ObjectNode optionsJson = (ObjectNode) createOptionsFromProject(tableName, null, null);
         optionsJson.put("includeStructure", true);
         optionsJson.put("includeDropStatement", true);
-        
+
         when(options.getProperty("options")).thenReturn(optionsJson.toString());
 
         try {
@@ -252,43 +251,43 @@ public class SqlExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
 
         Assert.assertNotNull(result);
 //        assertNotEquals(writer.toString(), SqlExporter.NO_OPTIONS_PRESENT_ERROR);
 //        assertNotEquals(writer.toString(), SqlExporter.NO_COL_SELECTED_ERROR);
-        
+
         boolean checkResult = result.contains("CREATE TABLE " + tableName);
-        Assert.assertEquals(checkResult,  true);
-       
-        checkResult = result.contains("INSERT INTO " + tableName );
-        Assert.assertEquals(checkResult,  true);
-        
+        Assert.assertEquals(checkResult, true);
+
+        checkResult = result.contains("INSERT INTO " + tableName);
+        Assert.assertEquals(checkResult, true);
+
         checkResult = result.contains("DROP TABLE IF EXISTS " + tableName + ";");
-        Assert.assertEquals(checkResult,  true);
-   
+        Assert.assertEquals(checkResult, true);
+
     }
 
     @Test
-    public void testGetCreateSql(){
-        createGrid(3,3);
+    public void testGetCreateSql() {
+        createGrid(3, 3);
         String tableName = "sql_table_test";
         String type = "CHAR";
         String size = "2";
         JsonNode optionsJson = createOptionsFromProject(tableName, type, size);
         List<String> columns = project.columnModel.columns.stream().map(col -> col.getName()).collect(Collectors.toList());
-       
-        sqlCreateBuilder  = new SqlCreateBuilder(tableName, columns, optionsJson);
+
+        sqlCreateBuilder = new SqlCreateBuilder(tableName, columns, optionsJson);
         String createSql = sqlCreateBuilder.getCreateSQL();
         Assert.assertNotNull(createSql);
         boolean result = createSql.contains(type + "(" + size + ")");
-        Assert.assertEquals(result,  true);
-        
+        Assert.assertEquals(result, true);
+
     }
-    
+
     @Test
-    public void testExportSqlWithNullFields(){
+    public void testExportSqlWithNullFields() {
         int inNull = 8;
         createGridWithNullFields(3, 3, inNull);
         String tableName = "sql_table_test";
@@ -296,8 +295,7 @@ public class SqlExporterTests extends RefineTest {
         optionsJson.put("includeStructure", true);
         optionsJson.put("includeDropStatement", true);
         optionsJson.put("convertNulltoEmptyString", true);
-        
-        
+
         when(options.getProperty("options")).thenReturn(optionsJson.toString());
 
         try {
@@ -305,7 +303,7 @@ public class SqlExporterTests extends RefineTest {
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
         Assert.assertNotNull(result);
 
@@ -313,9 +311,9 @@ public class SqlExporterTests extends RefineTest {
         Assert.assertEquals(countNull, inNull);
 
     }
-    
+
     @Test
-    public void testExportSqlWithNotNullColumns(){
+    public void testExportSqlWithNotNullColumns() {
         int noOfCols = 4;
         int noOfRows = 3;
         createGrid(noOfRows, noOfCols);
@@ -324,26 +322,26 @@ public class SqlExporterTests extends RefineTest {
         optionsJson.put("includeStructure", true);
         optionsJson.put("includeDropStatement", true);
         optionsJson.put("convertNulltoEmptyString", true);
-        
-       when(options.getProperty("options")).thenReturn(optionsJson.toString());
+
+        when(options.getProperty("options")).thenReturn(optionsJson.toString());
         try {
             SUT.export(project, options, engine, writer);
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
         logger.debug("\nresult:={} ", result);
         Assert.assertNotNull(result);
-     
+
         int countNull = countWordInString(result, "NOT NULL");
-        logger.debug("\nNot Null Count: {}" , countNull);
+        logger.debug("\nNot Null Count: {}", countNull);
         Assert.assertEquals(countNull, noOfCols);
 
     }
-    
+
     @Test
-    public void testExportSqlWithSingleQuote(){
+    public void testExportSqlWithSingleQuote() {
         int noOfCols = 4;
         int noOfRows = 1;
         createGridWithSingleQuote(noOfRows, noOfCols);
@@ -352,41 +350,41 @@ public class SqlExporterTests extends RefineTest {
         optionsJson.put("includeStructure", true);
         optionsJson.put("includeDropStatement", true);
         optionsJson.put("convertNulltoEmptyString", true);
-        
-       when(options.getProperty("options")).thenReturn(optionsJson.toString());
+
+        when(options.getProperty("options")).thenReturn(optionsJson.toString());
         try {
             SUT.export(project, options, engine, writer);
         } catch (IOException e) {
             Assert.fail();
         }
-        
+
         String result = writer.toString();
         logger.debug("\nresult:={} ", result);
 
-        Assert.assertTrue(result.contains("INSERT INTO sql_table_test (column0,column1,column2,column3) VALUES \n" + 
-        		"( 'It''s row0cell0','It''s row0cell1','It''s row0cell2','It''s row0cell3' )"));
+        Assert.assertTrue(result.contains("INSERT INTO sql_table_test (column0,column1,column2,column3) VALUES \n" +
+                "( 'It''s row0cell0','It''s row0cell1','It''s row0cell2','It''s row0cell3' )"));
 
     }
-  
-    //helper methods
-    
-   public int countWordInString(String input, String word){
-       if(input == null || input.isEmpty()) {
-           return 0;
-       }
-       int i = 0;
-       Pattern p = Pattern.compile(word);
-       Matcher m = p.matcher( input );
-       while (m.find()) {
-           i++;
-       }
-       
-       return i;
-       
-   }
-    
-   protected void createColumns(int noOfColumns){
-        for(int i = 0; i < noOfColumns; i++){
+
+    // helper methods
+
+    public int countWordInString(String input, String word) {
+        if (input == null || input.isEmpty()) {
+            return 0;
+        }
+        int i = 0;
+        Pattern p = Pattern.compile(word);
+        Matcher m = p.matcher(input);
+        while (m.find()) {
+            i++;
+        }
+
+        return i;
+
+    }
+
+    protected void createColumns(int noOfColumns) {
+        for (int i = 0; i < noOfColumns; i++) {
             try {
                 project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
@@ -395,165 +393,165 @@ public class SqlExporterTests extends RefineTest {
         }
     }
 
-    protected void createGrid(int noOfRows, int noOfColumns){
+    protected void createGrid(int noOfRows, int noOfColumns) {
         createColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("row" + i + "cell" + j, null));
             }
             project.rows.add(row);
         }
     }
-    
-    protected void createGridWithSingleQuote(int noOfRows, int noOfColumns){
+
+    protected void createGridWithSingleQuote(int noOfRows, int noOfColumns) {
         createColumns(noOfColumns);
 
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
+            for (int j = 0; j < noOfColumns; j++) {
                 row.cells.add(new Cell("It's row" + i + "cell" + j, null));
             }
             project.rows.add(row);
         }
     }
-    
-    protected void createGridWithNullFields(int noOfRows, int noOfColumns, int noOfNullFields){
+
+    protected void createGridWithNullFields(int noOfRows, int noOfColumns, int noOfNullFields) {
         createColumns(noOfColumns);
-        if(noOfNullFields > (noOfColumns * noOfRows)) {
+        if (noOfNullFields > (noOfColumns * noOfRows)) {
             noOfNullFields = noOfColumns * noOfRows;
         }
         int k = 0;
-        for(int i = 0; i < noOfRows; i++){
+        for (int i = 0; i < noOfRows; i++) {
             Row row = new Row(noOfColumns);
-            for(int j = 0; j < noOfColumns; j++){
-                if(k < noOfNullFields) {
-                    row.cells.add(new Cell("", null)); 
+            for (int j = 0; j < noOfColumns; j++) {
+                if (k < noOfNullFields) {
+                    row.cells.add(new Cell("", null));
                     k++;
-                }else {
+                } else {
                     row.cells.add(new Cell("row" + i + "cell" + j, null));
                 }
-                
+
             }
             project.rows.add(row);
         }
     }
-    
+
     protected ObjectNode createNumericColOptionsFromProject(String tableName, String type, String size) {
-        
+
         ObjectNode json = ParsingUtilities.mapper.createObjectNode();
         ArrayNode columns = json.putArray("columns");
         json.put("tableName", tableName);
-        
+
         List<Column> cols = project.columnModel.columns;
-      
+
         cols.forEach(c -> {
             ObjectNode columnModel = ParsingUtilities.mapper.createObjectNode();
             columnModel.put("name", c.getName());
-            if(type != null) {
+            if (type != null) {
                 columnModel.put("type", type);
             } else {
                 columnModel.put("type", "VARCHAR");
             }
-            if(size != null) {
-                columnModel.put("size", size); 
+            if (size != null) {
+                columnModel.put("size", size);
             } else {
                 columnModel.put("size", "100");
             }
-            
-            if(type != null) {
+
+            if (type != null) {
                 columnModel.put("type", type);
             }
-            if(size != null) {
+            if (size != null) {
                 columnModel.put("size", size);
             }
-            
+
             columns.add(columnModel);
-       
+
         });
-        
-       return json;
+
+        return json;
     }
-  
-   protected JsonNode createOptionsFromProject(String tableName, String type, String size) {
-       ObjectNode json = ParsingUtilities.mapper.createObjectNode();
-       json.put("tableName", tableName);
-       ArrayNode columns = json.putArray("columns");
-       
-       List<Column> cols = project.columnModel.columns;
-     
-       cols.forEach(c -> {
-           ObjectNode columnModel = ParsingUtilities.mapper.createObjectNode();
-           columnModel.put("name", c.getName());
-           if(type != null) {
-               columnModel.put("type", type);
-           }else {
-               columnModel.put("type", "VARCHAR");
-           }
-           if(size != null) {
-               columnModel.put("size", size); 
-           }else {
-               columnModel.put("size", "100");
-           }
-           
-           if(type != null) {
-               columnModel.put("type", type);
-           }
-           if(size != null) {
-               columnModel.put("size", size);
-           }
-           
-           columns.add(columnModel);
-      
-       });
-       
-       return json;
-   }
-   
+
+    protected JsonNode createOptionsFromProject(String tableName, String type, String size) {
+        ObjectNode json = ParsingUtilities.mapper.createObjectNode();
+        json.put("tableName", tableName);
+        ArrayNode columns = json.putArray("columns");
+
+        List<Column> cols = project.columnModel.columns;
+
+        cols.forEach(c -> {
+            ObjectNode columnModel = ParsingUtilities.mapper.createObjectNode();
+            columnModel.put("name", c.getName());
+            if (type != null) {
+                columnModel.put("type", type);
+            } else {
+                columnModel.put("type", "VARCHAR");
+            }
+            if (size != null) {
+                columnModel.put("size", size);
+            } else {
+                columnModel.put("size", "100");
+            }
+
+            if (type != null) {
+                columnModel.put("type", type);
+            }
+            if (size != null) {
+                columnModel.put("size", size);
+            }
+
+            columns.add(columnModel);
+
+        });
+
+        return json;
+    }
+
     protected ObjectNode createOptionsFromProject(String tableName, String type, String size, String defaultValue,
             boolean allowNull) {
-       
-       ObjectNode json = ParsingUtilities.mapper.createObjectNode();
-       ArrayNode columns = json.putArray("columns");
-       json.put("tableName", tableName);
-       
-       List<Column> cols = project.columnModel.columns;
-     
-       cols.forEach(c -> {
-           ObjectNode columnModel = ParsingUtilities.mapper.createObjectNode();
-           columnModel.put("name", c.getName());
-           if(type != null) {
-               columnModel.put("type", type);
-           }else {
-               columnModel.put("type", "VARCHAR");
-           }
-           if(size != null) {
-               columnModel.put("size", size); 
-           }else {
-               columnModel.put("size", "100");
-           }
-           
-           if(type != null) {
-               columnModel.put("type", type);
-           }
-           if(size != null) {
-               columnModel.put("size", size);
-           }
-          
-           columnModel.put("defaultValue", defaultValue);
-           columnModel.put("allowNull", allowNull);
-           
-           columns.add(columnModel);
-      
-       });
-       
-      return json;
-   }
-    
-    double generateRandomNumericValues(){
-        int precision = 100; //scale = 2
-        double randomnum = Math.floor(Math.random() * (10 * precision - 1 * precision) + 1 * precision) / (1*precision);
+
+        ObjectNode json = ParsingUtilities.mapper.createObjectNode();
+        ArrayNode columns = json.putArray("columns");
+        json.put("tableName", tableName);
+
+        List<Column> cols = project.columnModel.columns;
+
+        cols.forEach(c -> {
+            ObjectNode columnModel = ParsingUtilities.mapper.createObjectNode();
+            columnModel.put("name", c.getName());
+            if (type != null) {
+                columnModel.put("type", type);
+            } else {
+                columnModel.put("type", "VARCHAR");
+            }
+            if (size != null) {
+                columnModel.put("size", size);
+            } else {
+                columnModel.put("size", "100");
+            }
+
+            if (type != null) {
+                columnModel.put("type", type);
+            }
+            if (size != null) {
+                columnModel.put("size", size);
+            }
+
+            columnModel.put("defaultValue", defaultValue);
+            columnModel.put("allowNull", allowNull);
+
+            columns.add(columnModel);
+
+        });
+
+        return json;
+    }
+
+    double generateRandomNumericValues() {
+        int precision = 100; // scale = 2
+        double randomnum = Math.floor(Math.random() * (10 * precision - 1 * precision) + 1 * precision) / (1 * precision);
         return randomnum;
     }
 
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/EvalErrorTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/EvalErrorTests.java
index 8ac1ac714..3adaba265 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/EvalErrorTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/EvalErrorTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr;
 
 import org.slf4j.LoggerFactory;
@@ -55,7 +56,8 @@ public class EvalErrorTests extends RefineTest {
         Assert.assertTrue(invoke("innerHtml", "test") instanceof EvalError);
 
         EvalError evalError = (EvalError) invoke("innerHtml", "test");
-        Assert.assertEquals(evalError.toString(), "innerHtml() cannot work with this \'string\'. The first parameter is not an HTML Element.  Please first use parseHtml(string) and select(query) prior to using this function");
+        Assert.assertEquals(evalError.toString(),
+                "innerHtml() cannot work with this \'string\'. The first parameter is not an HTML Element.  Please first use parseHtml(string) and select(query) prior to using this function");
     }
 
     @Test
@@ -64,7 +66,8 @@ public class EvalErrorTests extends RefineTest {
         Assert.assertTrue(invoke("wholeText", "test") instanceof EvalError);
 
         EvalError evalError = (EvalError) invoke("wholeText", "test");
-        Assert.assertEquals(evalError.toString(), "wholeText() cannot work with this \'string\' and failed as the first parameter is not an XML or HTML Element.  Please first use parseXml() or parseHtml() and select(query) prior to using this function");
+        Assert.assertEquals(evalError.toString(),
+                "wholeText() cannot work with this \'string\' and failed as the first parameter is not an XML or HTML Element.  Please first use parseXml() or parseHtml() and select(query) prior to using this function");
     }
 
     @Test
@@ -73,6 +76,7 @@ public class EvalErrorTests extends RefineTest {
         Assert.assertTrue(invoke("xmlText", "test") instanceof EvalError);
 
         EvalError evalError = (EvalError) invoke("xmlText", "test");
-        Assert.assertEquals(evalError.toString(), "xmlText() cannot work with this \'string\' and failed as the first parameter is not an XML or HTML Element.  Please first use parseXml() or parseHtml() and select(query) prior to using this function");
+        Assert.assertEquals(evalError.toString(),
+                "xmlText() cannot work with this \'string\' and failed as the first parameter is not an XML or HTML Element.  Please first use parseXml() or parseHtml() and select(query) prior to using this function");
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java
index af2391fd3..6543f4ef9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/ExpressionUtilsTests.java
@@ -30,9 +30,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
- 
-package com.google.refine.expr;
 
+package com.google.refine.expr;
 
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -41,36 +40,33 @@ import org.testng.annotations.Test;
 
 import com.google.refine.RefineTest;
 
-
 public class ExpressionUtilsTests extends RefineTest {
 
-    
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-
     // -----------------tests------------
 
     @Test
     public void testSameValueTrue() {
-        Assert.assertTrue(ExpressionUtils.sameValue(null,null));
-        Assert.assertTrue(ExpressionUtils.sameValue("",""));
-        Assert.assertTrue(ExpressionUtils.sameValue("one","one"));
-        Assert.assertTrue(ExpressionUtils.sameValue(1,1));
-        Assert.assertTrue(ExpressionUtils.sameValue(1.0,1.00));
-        Assert.assertTrue(ExpressionUtils.sameValue(true,true));
+        Assert.assertTrue(ExpressionUtils.sameValue(null, null));
+        Assert.assertTrue(ExpressionUtils.sameValue("", ""));
+        Assert.assertTrue(ExpressionUtils.sameValue("one", "one"));
+        Assert.assertTrue(ExpressionUtils.sameValue(1, 1));
+        Assert.assertTrue(ExpressionUtils.sameValue(1.0, 1.00));
+        Assert.assertTrue(ExpressionUtils.sameValue(true, true));
     }
 
     @Test
     public void testSameValueFalse() {
-        Assert.assertFalse(ExpressionUtils.sameValue("",null));
-        Assert.assertFalse(ExpressionUtils.sameValue(null,""));
-        Assert.assertFalse(ExpressionUtils.sameValue("one","two"));
-        Assert.assertFalse(ExpressionUtils.sameValue(1,2));
-        Assert.assertFalse(ExpressionUtils.sameValue(1,1.0));
-        Assert.assertFalse(ExpressionUtils.sameValue(true,false));
+        Assert.assertFalse(ExpressionUtils.sameValue("", null));
+        Assert.assertFalse(ExpressionUtils.sameValue(null, ""));
+        Assert.assertFalse(ExpressionUtils.sameValue("one", "two"));
+        Assert.assertFalse(ExpressionUtils.sameValue(1, 2));
+        Assert.assertFalse(ExpressionUtils.sameValue(1, 1.0));
+        Assert.assertFalse(ExpressionUtils.sameValue(true, false));
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java
index 82d9f4f53..67437854a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CoalesceTests.java
@@ -46,17 +46,16 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-
 public class CoalesceTests extends RefineTest {
 
-    private static final Integer[] ZERO_TO_TWO = new Integer[] {0, 1, 2};
+    private static final Integer[] ZERO_TO_TWO = new Integer[] { 0, 1, 2 };
 
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @BeforeMethod
     public void setUp() {
         bindings = new Properties();
@@ -66,20 +65,20 @@ public class CoalesceTests extends RefineTest {
     public void tearDown() {
         bindings = null;
     }
-    
+
     @Test
-    public void testCoalesceInvalidParams() {        
+    public void testCoalesceInvalidParams() {
         Assert.assertTrue(invoke("coalesce") instanceof EvalError);
         Assert.assertTrue(invoke("coalesce", 1) instanceof EvalError);
     }
-    
+
     @Test
     public void testCoalesce() {
         Assert.assertNull(invoke("coalesce", (Object) null, (Object) null));
-        Assert.assertEquals(invoke("coalesce", (Object) null, "string"),"string");
-        Assert.assertEquals(invoke("coalesce", (Object) null, (Object) null, "string"),"string");
-        Assert.assertEquals(invoke("coalesce", (Object) null, 1),1);
-        Assert.assertEquals(invoke("coalesce", (Object) null, ZERO_TO_TWO),ZERO_TO_TWO);
+        Assert.assertEquals(invoke("coalesce", (Object) null, "string"), "string");
+        Assert.assertEquals(invoke("coalesce", (Object) null, (Object) null, "string"), "string");
+        Assert.assertEquals(invoke("coalesce", (Object) null, 1), 1);
+        Assert.assertEquals(invoke("coalesce", (Object) null, ZERO_TO_TWO), ZERO_TO_TWO);
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CrossTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CrossTests.java
index 3acd34062..41e914f01 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CrossTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/CrossTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import java.time.OffsetDateTime;
@@ -50,8 +51,9 @@ import com.google.refine.util.TestUtils;
  * Test cases for cross function.
  */
 public class CrossTests extends RefineTest {
+
     private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-    
+
     @Override
     @BeforeTest
     public void init() {
@@ -63,27 +65,27 @@ public class CrossTests extends RefineTest {
     Project projectAddress;
     Project projectDuplicate1;
     Project projectDuplicate2;
-    
+
     // data from: https://github.com/OpenRefine/OpenRefine/wiki/GREL-Other-Functions
     @BeforeMethod
     public void SetUp() {
         bindings = new Properties();
-        
+
         String projectName = "My Address Book";
         String input = "friend,address\n"
-                        + "john,120 Main St.\n"
-                        + "mary,50 Broadway Ave.\n"
-                        + "john,999 XXXXXX St.\n"                       // john's 2nd address
-                        + "anne,17 Morning Crescent\n"
-                        + "2017-05-12T05:45:00Z,dateTime\n"
-                        + "1600,integer\n"
-                        + "123456789123456789,long\n"
-                        + "true,boolean\n"
-                        + "3.14,double\n";
+                + "john,120 Main St.\n"
+                + "mary,50 Broadway Ave.\n"
+                + "john,999 XXXXXX St.\n" // john's 2nd address
+                + "anne,17 Morning Crescent\n"
+                + "2017-05-12T05:45:00Z,dateTime\n"
+                + "1600,integer\n"
+                + "123456789123456789,long\n"
+                + "true,boolean\n"
+                + "3.14,double\n";
         projectAddress = createCSVProject(projectName, input);
-    
+
         projectName = "Christmas Gifts";
-        input = "gift,recipient\n"   
+        input = "gift,recipient\n"
                 + "lamp,mary\n"
                 + "clock,john\n"
                 + "dateTime,2017-05-12T05:45:00Z\n"
@@ -96,10 +98,9 @@ public class CrossTests extends RefineTest {
         projectDuplicate1 = createCSVProject(projectName, input);
         projectDuplicate2 = createCSVProject(projectName, input);
 
-        
         bindings.put("project", projectGift);
-        
-        //Add some non-string value cells to each project
+
+        // Add some non-string value cells to each project
         projectAddress.rows.get(4).cells.set(0, new Cell(dateTimeValue, null));
         projectAddress.rows.get(5).cells.set(0, new Cell(1600, null));
         projectAddress.rows.get(6).cells.set(0, new Cell(123456789123456789L, null));
@@ -109,30 +110,30 @@ public class CrossTests extends RefineTest {
         projectGift.rows.get(3).cells.set(1, new Cell(1600, null));
         projectGift.rows.get(4).cells.set(1, new Cell(123456789123456789L, null));
         projectGift.rows.get(5).cells.set(1, new Cell(true, null));
-        
+
         // add a column address based on column recipient
         bindings.put("columnName", "recipient");
     }
-    
+
     @Test
     public void crossFunctionMissingProject() throws Exception {
         String nonExistentProject = "NOPROJECT";
-        Assert.assertEquals(((EvalError) invoke("cross", "Anne", nonExistentProject, "friend")).message, 
+        Assert.assertEquals(((EvalError) invoke("cross", "Anne", nonExistentProject, "friend")).message,
                 "Unable to find project with name: " + nonExistentProject);
     }
-    
+
     @Test
     public void crossFunctionMultipleProjects() throws Exception {
         String duplicateProjectName = "Duplicate";
-        Assert.assertEquals(((EvalError) invoke("cross", "Anne", duplicateProjectName, "friend")).message, 
+        Assert.assertEquals(((EvalError) invoke("cross", "Anne", duplicateProjectName, "friend")).message,
                 "2 projects found with name: " + duplicateProjectName);
     }
-    
+
     @Test
     public void crossFunctionMissingColumn() throws Exception {
         String nonExistentColumn = "NoColumn";
         String projectName = "My Address Book";
-        Assert.assertEquals(((EvalError) invoke("cross", "mary", projectName, nonExistentColumn)).message, 
+        Assert.assertEquals(((EvalError) invoke("cross", "mary", projectName, nonExistentColumn)).message,
                 "Unable to find column " + nonExistentColumn + " in project " + projectName);
     }
 
@@ -209,8 +210,8 @@ public class CrossTests extends RefineTest {
         String address = row.getCell(1).value.toString();
         Assert.assertEquals(address, "50 Broadway Ave.");
     }
-    
-    /**  
+
+    /**
      * To demonstrate that the cross function can look up multiple rows.
      */
     @Test
@@ -219,13 +220,12 @@ public class CrossTests extends RefineTest {
         String address = row.getCell(1).value.toString();
         Assert.assertEquals(address, "999 XXXXXX St.");
     }
-    
 
     @Test
     public void crossFunctionCaseSensitiveTest() throws Exception {
         Assert.assertNull(invoke("cross", "Anne", "My Address Book", "friend"));
     }
-    
+
     @Test
     public void crossFunctionDateTimeTest() throws Exception {
         Project project = (Project) bindings.get("project");
@@ -235,7 +235,7 @@ public class CrossTests extends RefineTest {
         String address = row.getCell(1).value.toString();
         Assert.assertEquals(address, "dateTime");
     }
-    
+
     @Test
     public void crossFunctionIntegerTest() throws Exception {
         Project project = (Project) bindings.get("project");
@@ -245,7 +245,7 @@ public class CrossTests extends RefineTest {
         String address = row.getCell(1).value.toString();
         Assert.assertEquals(address, "integer");
     }
-    
+
     @Test
     public void crossFunctionBooleanTest() throws Exception {
         Project project = (Project) bindings.get("project");
@@ -278,8 +278,8 @@ public class CrossTests extends RefineTest {
     }
 
     /**
-     * Two values will match if and only if they have the same string representation.
-     * In this case, "1600.0" doesn't equal to "1600".
+     * Two values will match if and only if they have the same string representation. In this case, "1600.0" doesn't
+     * equal to "1600".
      */
     @Test
     public void crossFunctionIntegerArgumentTest3() throws Exception {
@@ -352,24 +352,24 @@ public class CrossTests extends RefineTest {
     /**
      * If no match, return null.
      * 
-     * But if user still apply grel:value.cross("My Address Book", "friend")[0].cells["address"].value, 
-     * from the "Preview", the target cell shows "Error: java.lang.IndexOutOfBoundsException: Index: 0, Size: 0".
-     * It will still end up with blank if the onError set so.
+     * But if user still apply grel:value.cross("My Address Book", "friend")[0].cells["address"].value, from the
+     * "Preview", the target cell shows "Error: java.lang.IndexOutOfBoundsException: Index: 0, Size: 0". It will still
+     * end up with blank if the onError set so.
      */
     @Test
     public void crossFunctionMatchNotFoundTest() throws Exception {
         Assert.assertNull(invoke("cross", "NON-EXIST", "My Address Book", "friend"));
     }
-     
+
     /**
-     *  
-     *  rest of cells shows "Error: cross expects a cell or cell value, a project name to look up, and a column name in that project"
+     * 
+     * rest of cells shows "Error: cross expects a cell or cell value, a project name to look up, and a column name in
+     * that project"
      */
     @Test
     public void crossFunctionNonLiteralValue() throws Exception {
         Assert.assertEquals(((EvalError) invoke("cross", null, "My Address Book", "friend")).message,
                 "cross expects a cell or value, a project name to look up (optional), and a column name in that project (optional)");
     }
-    
-}
 
+}
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java
index ec2f612dc..204bf6d7b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/FacetCountTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class FacetCountTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/GetTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/GetTests.java
index 4a1118e0e..6a3873523 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/GetTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/GetTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import java.util.Properties;
@@ -74,10 +75,9 @@ public class GetTests extends RefineTest {
 
     @Test
     public void testGetJsonFieldAbsent() throws ParsingException {
-        String test =  "\"[{\\\"one\\\": \\\"1\\\"}]\".parseJson()[0].two";
+        String test = "\"[{\\\"one\\\": \\\"1\\\"}]\".parseJson()[0].two";
         Evaluable eval = MetaParser.parse("grel:" + test);
         Assert.assertNull(eval.evaluate(bindings));
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java
index 81e68a340..b86eb6214 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/HasFieldTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class HasFieldTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java
index 9e7ba61ac..4eab73f41 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/JsonizeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import static org.testng.Assert.assertEquals;
@@ -47,12 +48,11 @@ public class JsonizeTests extends RefineTest {
         Object[] emptyArray = {};
         assertEquals(invoke("jsonize", (Object) emptyArray), "[ ]");
 
-        Object[] objArray = {4, "hello", true, 0.01, null};
+        Object[] objArray = { 4, "hello", true, 0.01, null };
         assertEquals(invoke("jsonize", (Object) objArray), "[ 4, \"hello\", true, 0.01, null ]");
 
-        Object[][] multiArray = {{"OpenRefine", 12}, {13, 4.6}, {"data", "mining"}};
+        Object[][] multiArray = { { "OpenRefine", 12 }, { 13, 4.6 }, { "data", "mining" } };
         assertEquals(invoke("jsonize", (Object) multiArray), "[ [ \"OpenRefine\", 12 ], [ 13, 4.6 ], [ \"data\", \"mining\" ] ]");
 
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java
index ad783efe8..3e04d14d6 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class LengthTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/SliceTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/SliceTests.java
index c6b6cad03..6e3ce14bc 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/SliceTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/SliceTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class SliceTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java
index b797ebb2d..c0e5f8771 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import static org.testng.Assert.assertEquals;
@@ -41,6 +42,7 @@ import com.google.refine.expr.util.CalendarParserException;
 import com.google.refine.util.TestUtils;
 
 public class ToDateTests extends RefineTest {
+
     @Test
     public void testToDate() throws CalendarParserException {
         TimeZone originalTimeZone = TimeZone.getDefault();
@@ -57,48 +59,53 @@ public class ToDateTests extends RefineTest {
             assertTrue(invoke("toDate", "P1M") instanceof EvalError); // Durations aren't supported
 
             assertTrue(invoke("toDate", "2012-03-01") instanceof OffsetDateTime);
-            assertEquals(invoke("toDate", "2012-03-01"),CalendarParser.parseAsOffsetDateTime("2012-03-01"));
-            //parse as 'month first' date with and without explicit 'true' parameter
-            assertEquals(invoke("toDate", "01/03/2012"),CalendarParser.parseAsOffsetDateTime("2012-01-03"));
-            assertEquals(invoke("toDate", "01/03/2012",true),CalendarParser.parseAsOffsetDateTime("2012-01-03"));
-            //parse as 'month first' date with 'false' parameter
-            assertEquals(invoke("toDate", "01/03/2012",false),CalendarParser.parseAsOffsetDateTime("2012-03-01"));
-            //parse as 'month first' date without 'false' parameter but with format specified
-            assertEquals(invoke("toDate", "01/03/2012","dd/MM/yyyy"),CalendarParser.parseAsOffsetDateTime("2012-03-01"));
-            assertEquals(invoke("toDate", "2012-03-01","yyyy-MM-dd"),CalendarParser.parseAsOffsetDateTime("2012-03-01"));
-            //Two digit year
-            assertEquals(invoke("toDate", "02-02-01"),CalendarParser.parseAsOffsetDateTime("2001-02-02"));
+            assertEquals(invoke("toDate", "2012-03-01"), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            // parse as 'month first' date with and without explicit 'true' parameter
+            assertEquals(invoke("toDate", "01/03/2012"), CalendarParser.parseAsOffsetDateTime("2012-01-03"));
+            assertEquals(invoke("toDate", "01/03/2012", true), CalendarParser.parseAsOffsetDateTime("2012-01-03"));
+            // parse as 'month first' date with 'false' parameter
+            assertEquals(invoke("toDate", "01/03/2012", false), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            // parse as 'month first' date without 'false' parameter but with format specified
+            assertEquals(invoke("toDate", "01/03/2012", "dd/MM/yyyy"), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            assertEquals(invoke("toDate", "2012-03-01", "yyyy-MM-dd"), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            // Two digit year
+            assertEquals(invoke("toDate", "02-02-01"), CalendarParser.parseAsOffsetDateTime("2001-02-02"));
             // Multiple format strings should get tried sequentially until one succeeds or all are exhausted
-            assertEquals(invoke("toDate", "2012-03-01","MMM","yyyy-MM-dd"), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            assertEquals(invoke("toDate", "2012-03-01", "MMM", "yyyy-MM-dd"), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
 
             // Boolean argument combined with Multiple format strings
-            assertEquals(invoke("toDate", "01/03/2012",false, "MMM","yyyy-MM-dd","MM/dd/yyyy"), CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            assertEquals(invoke("toDate", "01/03/2012", false, "MMM", "yyyy-MM-dd", "MM/dd/yyyy"),
+                    CalendarParser.parseAsOffsetDateTime("2012-03-01"));
 
             // First string can be a locale identifier instead of a format string
-            assertEquals(invoke("toDate", "2013-06-01","zh"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
-            assertEquals(invoke("toDate", "01-六月-2013","zh","dd-MMM-yyyy"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
+            assertEquals(invoke("toDate", "2013-06-01", "zh"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
+            assertEquals(invoke("toDate", "01-六月-2013", "zh", "dd-MMM-yyyy"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
             assertEquals(invoke("toDate", "01-六月-2013", "zh-CN", "dd-MMM-yyyy"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
-            assertEquals(invoke("toDate", "01-六月-2013", "zh", "MMM-dd-yyyy", "dd-MMM-yyyy"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
+            assertEquals(invoke("toDate", "01-六月-2013", "zh", "MMM-dd-yyyy", "dd-MMM-yyyy"),
+                    CalendarParser.parseAsOffsetDateTime("2013-06-01"));
 
             // If a long, convert to string
             assertEquals(invoke("toDate", (long) 2012), invoke("toDate", "2012-01-01"));
 
             // If already a date, leave it alone
-            assertEquals(invoke("toDate", CalendarParser.parseAsOffsetDateTime("2012-03-01")),CalendarParser.parseAsOffsetDateTime("2012-03-01"));
+            assertEquals(invoke("toDate", CalendarParser.parseAsOffsetDateTime("2012-03-01")),
+                    CalendarParser.parseAsOffsetDateTime("2012-03-01"));
 
-            // FIXME: Date/times without timezone info were interpreted as local up until May 2018 at which point they switch to UTC
-            //      assertEquals(invoke("toDate", "2013-06-01T13:12:11"), CalendarParser.parseAsOffsetDateTime("2013-06-01 13:12:11"));
+            // FIXME: Date/times without timezone info were interpreted as local up until May 2018 at which point they
+            // switch to UTC
+            // assertEquals(invoke("toDate", "2013-06-01T13:12:11"), CalendarParser.parseAsOffsetDateTime("2013-06-01
+            // 13:12:11"));
 
             // These match current behavior, but would fail with the historic (pre-2018) behavior
             assertEquals(invoke("toDate", "2013-06-01T13:12:11Z"), CalendarParser.parseAsOffsetDateTime("2013-06-01 13:12:11"));
             assertEquals(invoke("toDate", "2013-06-01Z"), CalendarParser.parseAsOffsetDateTime("2013-06-01"));
 
             // TODO: more tests for datetimes with timezones and/or offsets
-            //       assertEquals(invoke("toDate", "2013-06-01T13:12:11+06:00"), CalendarParser.parseAsOffsetDateTime("2013-06-01 13:12:11"));
+            // assertEquals(invoke("toDate", "2013-06-01T13:12:11+06:00"),
+            // CalendarParser.parseAsOffsetDateTime("2013-06-01 13:12:11"));
         } finally {
             TimeZone.setDefault(originalTimeZone);
         }
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java
index 6cf061adb..748ad812c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToNumberTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import static org.testng.Assert.assertEquals;
@@ -46,11 +47,11 @@ public class ToNumberTests extends RefineTest {
     @Test
     public void testConversions() {
         Function f = new ToNumber();
-        assertEquals(f.call(bindings, new Object[] {Long.valueOf(11)}), Long.valueOf(11));
-        assertEquals(f.call(bindings, new Object[] {"12"}), Long.valueOf(12));
-        assertTrue((Double)f.call(bindings, new Object[] {"12345.6789"}) - Double.valueOf(12345.6789) < EPSILON);
-        assertTrue(f.call(bindings, new Object[] {"abc"}) instanceof EvalError);
-        }
+        assertEquals(f.call(bindings, new Object[] { Long.valueOf(11) }), Long.valueOf(11));
+        assertEquals(f.call(bindings, new Object[] { "12" }), Long.valueOf(12));
+        assertTrue((Double) f.call(bindings, new Object[] { "12345.6789" }) - Double.valueOf(12345.6789) < EPSILON);
+        assertTrue(f.call(bindings, new Object[] { "abc" }) instanceof EvalError);
+    }
 
     @Test
     public void testToNumber() {
@@ -67,4 +68,3 @@ public class ToNumberTests extends RefineTest {
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java
index ad0fe60d6..f7f349b95 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/ToStringTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import static org.testng.Assert.assertEquals;
@@ -38,13 +39,14 @@ import com.google.refine.expr.util.CalendarParserException;
 import com.google.refine.util.TestUtils;
 
 public class ToStringTests extends RefineTest {
+
     @Test
     public void testToString() throws CalendarParserException {
         assertTrue(invoke("toString") instanceof EvalError);
         assertEquals(invoke("toString", (Object) null), "");
         assertEquals(invoke("toString", Long.valueOf(100)), "100");
         assertEquals(invoke("toString", Double.valueOf(100.0)), "100.0");
-        assertEquals(invoke("toString", Double.valueOf(100.0),"%.0f"), "100");
+        assertEquals(invoke("toString", Double.valueOf(100.0), "%.0f"), "100");
 
         String inputDate = "2013-06-01";
         assertEquals(invoke("toString", CalendarParser.parseAsOffsetDateTime(inputDate)), "2013-06-01T00:00:00Z");
@@ -60,4 +62,3 @@ public class ToStringTests extends RefineTest {
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/TypeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/TypeTests.java
index 05d193d41..ce3f19fb7 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/TypeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/TypeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions;
 
 import java.time.OffsetDateTime;
@@ -44,8 +45,8 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-
 public class TypeTests extends RefineTest {
+
     static final List<String> listArray = Arrays.asList("v1", "v2", "v3");
     private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
 
@@ -72,12 +73,11 @@ public class TypeTests extends RefineTest {
 
     @Test
     public void testType() {
-        Assert.assertEquals(invoke("type", (Object) null),"undefined");
-        Assert.assertEquals(invoke("type", 1),"number");
-        Assert.assertEquals(invoke("type", true),"boolean");
-        Assert.assertEquals(invoke("type", "a string"),"string");
+        Assert.assertEquals(invoke("type", (Object) null), "undefined");
+        Assert.assertEquals(invoke("type", 1), "number");
+        Assert.assertEquals(invoke("type", true), "boolean");
+        Assert.assertEquals(invoke("type", "a string"), "string");
         Assert.assertEquals(invoke("type", dateTimeValue), "date");
         Assert.assertEquals(invoke("type", listArray), "array");
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java
index 05be42d55..f6023d277 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/InArrayTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.arrays;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -40,19 +41,19 @@ import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
 public class InArrayTests extends RefineTest {
-    
+
     static Properties bindings;
     static final List<String> listArray = Arrays.asList("v1", "v2", "v3");
-    static final String stringArray[] = {"v1","v2","v3"};
-    
+    static final String stringArray[] = { "v1", "v2", "v3" };
+
     @Test
     public void testInArrayParameters() {
         Assert.assertTrue(invoke("inArray") instanceof EvalError);
         Assert.assertTrue(invoke("inArray", "string1") instanceof EvalError);
-        Assert.assertTrue(invoke("inArray", "string1","string2") instanceof EvalError);
-        Assert.assertTrue(invoke("inArray", "string1","string2","string3") instanceof EvalError);
+        Assert.assertTrue(invoke("inArray", "string1", "string2") instanceof EvalError);
+        Assert.assertTrue(invoke("inArray", "string1", "string2", "string3") instanceof EvalError);
     }
-    
+
     @Test
     public void testInArray() {
         Assert.assertTrue((boolean) invoke("inArray", listArray, "v1"));
@@ -60,7 +61,7 @@ public class InArrayTests extends RefineTest {
         Assert.assertTrue((boolean) invoke("inArray", stringArray, "v1"));
         Assert.assertFalse((boolean) invoke("inArray", stringArray, "v4"));
     }
-    
+
     @Test
     public void testInArrayWithArrayNode() {
         ObjectMapper mapper = new ObjectMapper();
@@ -72,4 +73,3 @@ public class InArrayTests extends RefineTest {
         Assert.assertFalse((boolean) invoke("inArray", arrayNode, "v4"));
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java
index 98fd316a6..5c5f72971 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
@@ -33,24 +34,24 @@ import com.google.refine.expr.ParsingException;
 import com.google.refine.util.TestUtils;
 
 public class JoinTests extends RefineTest {
+
     @Test
     public void joinArray() throws ParsingException {
-        String[] test = {"[2,1,3].join('|')", "2|1|3"};
+        String[] test = { "[2,1,3].join('|')", "2|1|3" };
         parseEval(bindings, test);
 
         // TODO: This is current behavior, but is it what we want?
-        String[] test1 = {"[2,null,3].join(', ')", "2, 3"};
+        String[] test1 = { "[2,null,3].join(', ')", "2, 3" };
         parseEval(bindings, test1);
 
-        String[] test2 = {"['z','b','c','a'].join('-')", "z-b-c-a"};
+        String[] test2 = { "['z','b','c','a'].join('-')", "z-b-c-a" };
         parseEval(bindings, test2);
 
         // TODO: Do we really want the following two tests to return different results?
-        String[] test3 = {"['z', null,'c','a'].join('-')", "z-c-a"};
+        String[] test3 = { "['z', null,'c','a'].join('-')", "z-c-a" };
         parseEval(bindings, test3);
-        String[] test4 = {"['z', '','c','a'].join('-')", "z--c-a"};
+        String[] test4 = { "['z', '','c','a'].join('-')", "z--c-a" };
         parseEval(bindings, test4);
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java
index ec0f2ffed..7e579b2af 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/ReverseTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
@@ -33,27 +34,26 @@ import com.google.refine.expr.ParsingException;
 import com.google.refine.util.TestUtils;
 
 public class ReverseTests extends RefineTest {
+
     @Test
     public void reverseJsonArray() throws ParsingException {
-        String[] test = {"'[2,1,3]'.parseJson().reverse().toString()", "[3, 1, 2]"};
+        String[] test = { "'[2,1,3]'.parseJson().reverse().toString()", "[3, 1, 2]" };
         parseEval(bindings, test);
-        String[] test1 = {"'[2,null,3]'.parseJson().reverse().toString()", "[3, null, 2]"};
+        String[] test1 = { "'[2,null,3]'.parseJson().reverse().toString()", "[3, null, 2]" };
         parseEval(bindings, test1);
     }
 
     @Test
     public void reverseArray() throws ParsingException {
-        String[] test = {"[2,1,3].reverse().toString()", "[3, 1, 2]"};
+        String[] test = { "[2,1,3].reverse().toString()", "[3, 1, 2]" };
         parseEval(bindings, test);
-        String[] test1 = {"[2,null,3].reverse().toString()", "[3, null, 2]"};
+        String[] test1 = { "[2,null,3].reverse().toString()", "[3, null, 2]" };
         parseEval(bindings, test1);
 
-        String[] test2 = {"['z','b','c','a'].reverse().toString()", "[a, c, b, z]"};
+        String[] test2 = { "['z','b','c','a'].reverse().toString()", "[a, c, b, z]" };
         parseEval(bindings, test2);
-        String[] test3 = {"['z',null,'c','a'].reverse().toString()", "[a, c, null, z]"};
+        String[] test3 = { "['z',null,'c','a'].reverse().toString()", "[a, c, null, z]" };
         parseEval(bindings, test3);
     }
 
-
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java
index ebce0574d..efc565c11 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/SortTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
@@ -34,27 +35,28 @@ import com.google.refine.expr.ParsingException;
 import com.google.refine.util.TestUtils;
 
 public class SortTests extends RefineTest {
+
     @Test
     public void sortJsonArray() throws ParsingException {
-        String[] test = {"'[2,1,3]'.parseJson().sort().toString()", "[1, 2, 3]"};
+        String[] test = { "'[2,1,3]'.parseJson().sort().toString()", "[1, 2, 3]" };
         parseEval(bindings, test);
-        String[] test1 = {"'[2,null,3]'.parseJson().sort().toString()", "[2, 3, null]"};
+        String[] test1 = { "'[2,null,3]'.parseJson().sort().toString()", "[2, 3, null]" };
         parseEval(bindings, test1);
     }
 
     @Test
     public void sortArray() throws ParsingException {
-        String[] test = {"[2,1,3].sort().toString()", "[1, 2, 3]"};
+        String[] test = { "[2,1,3].sort().toString()", "[1, 2, 3]" };
         parseEval(bindings, test);
-        String[] test1 = {"[2,null,3].sort().toString()", "[2, 3, null]"};
+        String[] test1 = { "[2,null,3].sort().toString()", "[2, 3, null]" };
         parseEval(bindings, test1);
 
-        String[] test2 = {"['z','b','c','a'].sort().toString()", "[a, b, c, z]"};
+        String[] test2 = { "['z','b','c','a'].sort().toString()", "[a, b, c, z]" };
         parseEval(bindings, test2);
-        String[] test3 = {"['z',null,'c','a'].sort().toString()", "[a, c, z, null]"};
+        String[] test3 = { "['z',null,'c','a'].sort().toString()", "[a, c, z, null]" };
         parseEval(bindings, test3);
 
-        String[] test4 = {"[toDate(2020), '2018-03-02'.toDate()].sort().toString()", "[2018-03-02T00:00Z, 2020-01-01T00:00Z]"};
+        String[] test4 = { "[toDate(2020), '2018-03-02'.toDate()].sort().toString()", "[2018-03-02T00:00Z, 2020-01-01T00:00Z]" };
         parseEval(bindings, test4);
     }
 
@@ -70,4 +72,3 @@ public class SortTests extends RefineTest {
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java
index 1b7b51f22..66f9f65c5 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/arrays/UniquesTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.arrays;
 
 import org.testng.annotations.Test;
@@ -33,40 +34,41 @@ import com.google.refine.expr.ParsingException;
 import com.google.refine.util.TestUtils;
 
 public class UniquesTests extends RefineTest {
+
     @Test
     public void uniquesJsonArray() throws ParsingException {
-        String[] test = {"'{a:[2,1,1,3]}'.parseJson().a.uniques().toString()", "[2, 1, 3]"};
+        String[] test = { "'{a:[2,1,1,3]}'.parseJson().a.uniques().toString()", "[2, 1, 3]" };
         parseEval(bindings, test);
-        String[] test1 = {"'[2,2,null,null,3,3]'.parseJson().uniques().toString()", "[2, null, 3]"};
+        String[] test1 = { "'[2,2,null,null,3,3]'.parseJson().uniques().toString()", "[2, null, 3]" };
         parseEval(bindings, test1);
     }
 
     @Test
     public void uniquesArray() throws ParsingException {
-        String[] test = {"[2,1,1,3].uniques().toString()", "[2, 1, 3]"};
+        String[] test = { "[2,1,1,3].uniques().toString()", "[2, 1, 3]" };
         parseEval(bindings, test);
-        String[] test1 = {"[2,2,null,null,3,3,3].uniques().toString()", "[2, null, 3]"};
+        String[] test1 = { "[2,2,null,null,3,3,3].uniques().toString()", "[2, null, 3]" };
         parseEval(bindings, test1);
 
-        String[] test2 = {"['z','b','c','c','a'].uniques().toString()", "[z, b, c, a]"};
+        String[] test2 = { "['z','b','c','c','a'].uniques().toString()", "[z, b, c, a]" };
         parseEval(bindings, test2);
-        String[] test3 = {"['z','z',null,'c','a'].uniques().toString()", "[z, null, c, a]"};
+        String[] test3 = { "['z','z',null,'c','a'].uniques().toString()", "[z, null, c, a]" };
         parseEval(bindings, test3);
 
-        String[] test4 = {"[toDate(2020), '2018-03-02'.toDate(), toDate(2020)].uniques().toString()", "[2020-01-01T00:00Z, 2018-03-02T00:00Z]"};
+        String[] test4 = { "[toDate(2020), '2018-03-02'.toDate(), toDate(2020)].uniques().toString()",
+                "[2020-01-01T00:00Z, 2018-03-02T00:00Z]" };
         parseEval(bindings, test4);
 
-        String[] test5 = {"[null,null,null].uniques().toString()", "[null]"};
+        String[] test5 = { "[null,null,null].uniques().toString()", "[null]" };
         parseEval(bindings, test5);
     }
 
     @Test
     public void uniquesMixedArray() throws ParsingException {
-        String[] test = {"[2,1.0,3,1.0].uniques().toString()", "[2, 1.0, 3]"};
+        String[] test = { "[2,1.0,3,1.0].uniques().toString()", "[2, 1.0, 3]" };
         parseEval(bindings, test);
-        String[] test1 = {"[2,'a',3,3,'a'].uniques().toString()", "[2, a, 3]"};
+        String[] test1 = { "[2,'a',3,3,'a'].uniques().toString()", "[2, a, 3]" };
         parseEval(bindings, test1);
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java
index 8a27ff3d6..f0d20ff90 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/AndTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class AndTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java
index ca8d79978..e0a5d865b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/BooleanTests.java
@@ -41,24 +41,23 @@ import org.testng.annotations.Test;
 import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 
-
 public class BooleanTests extends RefineTest {
 
     private static String TRUTH_TABLE[][] = {
-        {"and","true","true","true","true"},
-        {"and","false","false","false","false"},
-        {"and","true","false","false","false"},
-        {"and","false","true","true","false"},
+            { "and", "true", "true", "true", "true" },
+            { "and", "false", "false", "false", "false" },
+            { "and", "true", "false", "false", "false" },
+            { "and", "false", "true", "true", "false" },
 
-        {"or","true","true","true","true"},
-        {"or","false","false","false","false"},
-        {"or","true","false","false","true"},
-        {"or","false","true","true","true"},
+            { "or", "true", "true", "true", "true" },
+            { "or", "false", "false", "false", "false" },
+            { "or", "true", "false", "false", "true" },
+            { "or", "false", "true", "true", "true" },
 
-        {"xor","true","true","true","false"},
-        {"xor","false","false","false","false"},
-        {"xor","true","false","false","true"},
-        {"xor","false","true","false","true"},
+            { "xor", "true", "true", "true", "false" },
+            { "xor", "false", "false", "false", "false" },
+            { "xor", "true", "false", "false", "true" },
+            { "xor", "false", "true", "false", "true" },
     };
 
     @Override
@@ -69,20 +68,20 @@ public class BooleanTests extends RefineTest {
 
     @Test
     public void testInvalidParams() {
-        for (String op : new String[] {"and","or","xor"}) {
-        Assert.assertTrue(invoke(op) instanceof EvalError);
-        Assert.assertTrue(invoke(op, Boolean.TRUE, Integer.valueOf(1)) instanceof EvalError);
-        Assert.assertTrue(invoke(op, Integer.valueOf(1), Boolean.TRUE) instanceof EvalError);
-        Assert.assertTrue(invoke(op, Boolean.TRUE,"foo") instanceof EvalError);
-        Assert.assertTrue(invoke(op, "foo", Boolean.TRUE) instanceof EvalError);
-        Assert.assertTrue(invoke(op, Boolean.TRUE) instanceof EvalError);
+        for (String op : new String[] { "and", "or", "xor" }) {
+            Assert.assertTrue(invoke(op) instanceof EvalError);
+            Assert.assertTrue(invoke(op, Boolean.TRUE, Integer.valueOf(1)) instanceof EvalError);
+            Assert.assertTrue(invoke(op, Integer.valueOf(1), Boolean.TRUE) instanceof EvalError);
+            Assert.assertTrue(invoke(op, Boolean.TRUE, "foo") instanceof EvalError);
+            Assert.assertTrue(invoke(op, "foo", Boolean.TRUE) instanceof EvalError);
+            Assert.assertTrue(invoke(op, Boolean.TRUE) instanceof EvalError);
         }
         String op = "not";
         Assert.assertTrue(invoke(op) instanceof EvalError);
         Assert.assertTrue(invoke(op, Boolean.TRUE, Boolean.TRUE) instanceof EvalError);
         Assert.assertTrue(invoke(op, Integer.valueOf(1)) instanceof EvalError);
         Assert.assertTrue(invoke(op, "foo") instanceof EvalError);
-     }
+    }
 
     @Test
     public void testBinary() {
@@ -92,9 +91,9 @@ public class BooleanTests extends RefineTest {
             Boolean op2 = Boolean.valueOf(test[2]);
             Boolean op3 = Boolean.valueOf(test[3]);
             Boolean result = Boolean.valueOf(test[4]);
-            Assert.assertEquals(invoke(operator, op1, op2, op3),result);
+            Assert.assertEquals(invoke(operator, op1, op2, op3), result);
         }
-        Assert.assertEquals(invoke("not", Boolean.TRUE),Boolean.FALSE);
-        Assert.assertEquals(invoke("not", Boolean.FALSE),Boolean.TRUE);
+        Assert.assertEquals(invoke("not", Boolean.TRUE), Boolean.FALSE);
+        Assert.assertEquals(invoke("not", Boolean.FALSE), Boolean.TRUE);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java
index b310a0a75..44c0051d3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/NotTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class NotTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java
index 14436a5a6..3c3e57535 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/OrTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class OrTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java
index b777c2d76..6cfdfbb18 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/booleans/XorTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.booleans;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class XorTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java
index 7eec46e06..57045d2b9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/DatePartTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.date;
 
 import java.time.OffsetDateTime;
@@ -41,75 +42,74 @@ import org.testng.annotations.Test;
 import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
-
 public class DatePartTests extends RefineTest {
 
     static Properties bindings;
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
-    private  DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss.SSSSSSSSSX");
-    
+
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss.SSSSSSSSSX");
+
     @Test
-    public void testOffsetDateTimeDatePart() {        
+    public void testOffsetDateTimeDatePart() {
         // 2018-4-30 23:55:44
         OffsetDateTime source = OffsetDateTime.parse("20180430-23:55:44.000789000Z",
                 formatter);
-        
+
         // hours
         Assert.assertEquals(invoke("datePart", source, "hours"), 23);
         Assert.assertEquals(invoke("datePart", source, "hour"), 23);
         Assert.assertEquals(invoke("datePart", source, "h"), 23);
-        
+
         // minutes
         Assert.assertEquals(invoke("datePart", source, "minutes"), 55);
         Assert.assertEquals(invoke("datePart", source, "minute"), 55);
         Assert.assertEquals(invoke("datePart", source, "min"), 55);
-        
+
         // seconds
         Assert.assertEquals(invoke("datePart", source, "seconds"), 44);
         Assert.assertEquals(invoke("datePart", source, "sec"), 44);
         Assert.assertEquals(invoke("datePart", source, "s"), 44);
-        
+
         // milliseconds
         Assert.assertEquals(invoke("datePart", source, "milliseconds"), 789);
         Assert.assertEquals(invoke("datePart", source, "ms"), 789);
         Assert.assertEquals(invoke("datePart", source, "S"), 789);
-        
+
         // nanos
         Assert.assertEquals(invoke("datePart", source, "nanos"), 789000);
         Assert.assertEquals(invoke("datePart", source, "nano"), 789000);
         Assert.assertEquals(invoke("datePart", source, "n"), 789000);
-        
+
         // years
         Assert.assertEquals(invoke("datePart", source, "years"), 2018);
         Assert.assertEquals(invoke("datePart", source, "year"), 2018);
-        
+
         // months
         Assert.assertEquals(invoke("datePart", source, "months"), 4);
         Assert.assertEquals(invoke("datePart", source, "month"), 4);
-        
+
         // weeks
         Assert.assertEquals(invoke("datePart", source, "weeks"), 5);
         Assert.assertEquals(invoke("datePart", source, "week"), 5);
         Assert.assertEquals(invoke("datePart", source, "w"), 5);
-        
+
         // days, day, d
         Assert.assertEquals(invoke("datePart", source, "days"), 30);
         Assert.assertEquals(invoke("datePart", source, "day"), 30);
         Assert.assertEquals(invoke("datePart", source, "d"), 30);
-        
+
         // weekday
         Assert.assertEquals(invoke("datePart", source, "weekday"), "MONDAY");
-        
+
         // time
         Assert.assertEquals(invoke("datePart", source, "time"), 1525132544000l);
     }
-    
+
     // Convert Date to Calendar
     private Calendar dateToCalendar(Date date) {
         Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java
index f39bd0c79..b359a4152 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/IncTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.date;
 
 import java.time.OffsetDateTime;
@@ -39,10 +40,10 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-
 public class IncTests extends RefineTest {
-    private  DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss.SSSSSSSSSX");
-    
+
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss.SSSSSSSSSX");
+
     @Override
     @BeforeTest
     public void init() {
@@ -50,59 +51,59 @@ public class IncTests extends RefineTest {
     }
 
     @Test
-    public void testInc() {        
+    public void testInc() {
         OffsetDateTime source = OffsetDateTime.parse("20180510-23:55:44.000789000Z",
                 formatter);
-        
+
         // add hours
-        Assert.assertTrue(invoke("inc",  source, 2, "hours") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "hours"), source.plus(2, ChronoUnit.HOURS));
-        Assert.assertEquals(invoke("inc",  source, 2, "hour"), source.plus(2, ChronoUnit.HOURS));
-        Assert.assertEquals(invoke("inc",  source, 2, "h"), source.plus(2, ChronoUnit.HOURS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "hours") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "hours"), source.plus(2, ChronoUnit.HOURS));
+        Assert.assertEquals(invoke("inc", source, 2, "hour"), source.plus(2, ChronoUnit.HOURS));
+        Assert.assertEquals(invoke("inc", source, 2, "h"), source.plus(2, ChronoUnit.HOURS));
+
         // add years
-        Assert.assertTrue(invoke("inc",  source, 2, "year") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "years"), source.plus(2, ChronoUnit.YEARS));
-        Assert.assertEquals(invoke("inc",  source, 2, "year"), source.plus(2, ChronoUnit.YEARS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "year") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "years"), source.plus(2, ChronoUnit.YEARS));
+        Assert.assertEquals(invoke("inc", source, 2, "year"), source.plus(2, ChronoUnit.YEARS));
+
         // add months
-        Assert.assertTrue(invoke("inc",  source, 2, "months") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "months"), source.plus(2, ChronoUnit.MONTHS));
-        Assert.assertEquals(invoke("inc",  source, 2, "month"), source.plus(2, ChronoUnit.MONTHS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "months") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "months"), source.plus(2, ChronoUnit.MONTHS));
+        Assert.assertEquals(invoke("inc", source, 2, "month"), source.plus(2, ChronoUnit.MONTHS));
+
         // add minutes
-        Assert.assertTrue(invoke("inc",  source, 2, "minutes") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "minutes"), source.plus(2, ChronoUnit.MINUTES));
-        Assert.assertEquals(invoke("inc",  source, 2, "minute"), source.plus(2, ChronoUnit.MINUTES));
-        Assert.assertEquals(invoke("inc",  source, 2, "min"), source.plus(2, ChronoUnit.MINUTES));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "minutes") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "minutes"), source.plus(2, ChronoUnit.MINUTES));
+        Assert.assertEquals(invoke("inc", source, 2, "minute"), source.plus(2, ChronoUnit.MINUTES));
+        Assert.assertEquals(invoke("inc", source, 2, "min"), source.plus(2, ChronoUnit.MINUTES));
+
         // add weeks
-        Assert.assertTrue(invoke("inc",  source, 2, "weeks") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "weeks"), source.plus(2, ChronoUnit.WEEKS));
-        Assert.assertEquals(invoke("inc",  source, 2, "week"), source.plus(2, ChronoUnit.WEEKS));
-        Assert.assertEquals(invoke("inc",  source, 2, "w"), source.plus(2, ChronoUnit.WEEKS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "weeks") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "weeks"), source.plus(2, ChronoUnit.WEEKS));
+        Assert.assertEquals(invoke("inc", source, 2, "week"), source.plus(2, ChronoUnit.WEEKS));
+        Assert.assertEquals(invoke("inc", source, 2, "w"), source.plus(2, ChronoUnit.WEEKS));
+
         // add seconds
-        Assert.assertTrue(invoke("inc",  source, 2, "seconds") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "seconds"), source.plus(2, ChronoUnit.SECONDS));
-        Assert.assertEquals(invoke("inc",  source, 2, "sec"), source.plus(2, ChronoUnit.SECONDS));
-        Assert.assertEquals(invoke("inc",  source, 2, "s"), source.plus(2, ChronoUnit.SECONDS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "seconds") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "seconds"), source.plus(2, ChronoUnit.SECONDS));
+        Assert.assertEquals(invoke("inc", source, 2, "sec"), source.plus(2, ChronoUnit.SECONDS));
+        Assert.assertEquals(invoke("inc", source, 2, "s"), source.plus(2, ChronoUnit.SECONDS));
+
         // add milliseconds
-        Assert.assertTrue(invoke("inc",  source, 2, "milliseconds") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "milliseconds"), source.plus(2, ChronoUnit.MILLIS));
-        Assert.assertEquals(invoke("inc",  source, 2, "ms"), source.plus(2, ChronoUnit.MILLIS));
-        Assert.assertEquals(invoke("inc",  source, 2, "S"), source.plus(2, ChronoUnit.MILLIS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "milliseconds") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "milliseconds"), source.plus(2, ChronoUnit.MILLIS));
+        Assert.assertEquals(invoke("inc", source, 2, "ms"), source.plus(2, ChronoUnit.MILLIS));
+        Assert.assertEquals(invoke("inc", source, 2, "S"), source.plus(2, ChronoUnit.MILLIS));
+
         // add nanos
-        Assert.assertTrue(invoke("inc",  source, 2, "nanos") instanceof OffsetDateTime);
-        Assert.assertEquals(invoke("inc",  source, 2, "nanos"), source.plus(2, ChronoUnit.NANOS));
-        Assert.assertEquals(invoke("inc",  source, 2, "nano"), source.plus(2, ChronoUnit.NANOS));
-        Assert.assertEquals(invoke("inc",  source, 2, "n"), source.plus(2, ChronoUnit.NANOS));
-        
+        Assert.assertTrue(invoke("inc", source, 2, "nanos") instanceof OffsetDateTime);
+        Assert.assertEquals(invoke("inc", source, 2, "nanos"), source.plus(2, ChronoUnit.NANOS));
+        Assert.assertEquals(invoke("inc", source, 2, "nano"), source.plus(2, ChronoUnit.NANOS));
+        Assert.assertEquals(invoke("inc", source, 2, "n"), source.plus(2, ChronoUnit.NANOS));
+
         // exception
         Assert.assertTrue(invoke("inc", source, 99) instanceof EvalError);
         Assert.assertTrue(invoke("inc", source.toInstant().toEpochMilli(), 99, "h") instanceof EvalError);
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java
index 72df95657..8bfaf9248 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/date/NowTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.date;
 
 import java.time.OffsetDateTime;
@@ -37,10 +38,10 @@ import org.testng.annotations.Test;
 import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
-
 public class NowTests extends RefineTest {
-    private  DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss.SSSSSSSSSX");
-    
+
+    private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd-HH:mm:ss.SSSSSSSSSX");
+
     @Override
     @BeforeTest
     public void init() {
@@ -48,13 +49,13 @@ public class NowTests extends RefineTest {
     }
 
     @Test
-    public void testNow() {        
+    public void testNow() {
         // 2018-4-30 23:55:44
         OffsetDateTime source = OffsetDateTime.parse("20180430-23:55:44.000789000Z",
                 formatter);
-        
+
         Assert.assertTrue(invoke("now") instanceof OffsetDateTime);
-        Assert.assertTrue(((OffsetDateTime)invoke("now")).isAfter(source));
+        Assert.assertTrue(((OffsetDateTime) invoke("now")).isAfter(source));
     }
-   
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.java
index 9a9926f1d..f1f29e07d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/InnerHtmlTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.html;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class InnerHtmlTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.java
index 984dfc077..0da4a3ce8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/html/ParseHtmlTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.html;
 
 import org.jsoup.Jsoup;
@@ -39,28 +40,30 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-public class ParseHtmlTests extends RefineTest  {
-    
+public class ParseHtmlTests extends RefineTest {
+
     static Properties bindings;
-    static String h =   "<html>\n" +
-                        "<head>\n" +
-                        "</head>\n" +
-                        "    <body>\n" +
-                        "        <h1>head1</h1>\n" +
-                        "        <div class=\"class1\">\n" +
-                        "            <p>para1 <strong>strong text</strong></p>\n" +
-                        "            <p>para2</p>\n" +
-                        "        </div>\n" +
-                        "        <div class=\"commentthread_comment_text\" id=\"comment_content_257769\">\n" +
-                                 "  Me : Make a 2nd game ?\n" +
-                                 " <br>Dev : Nah man , too much work.\n" +
-                                 " <br>Me : So what's it gonna be ?\n" +
-                                 " <br>Dev : REMASTER !!!!\n" +
-                                 " <br>" +
-                                 "</div>" +
-                        "    </body>\n" +
-                        "</html>";
-    
+    static String h = "<html>\n" +
+            "<head>\n" +
+            "<script type=\"application/json\">One Two</script>" +
+            "</head>\n" +
+            "    <body>\n" +
+            "        <h1>head1</h1>\n" +
+            "        <div class=\"class1\">\n" +
+            "            <p>para1 <strong>strong text</strong></p>\n" +
+            "            <p>para2</p>\n" +
+            "        </div>\n" +
+            "        <div class=\"commentthread_comment_text\" id=\"comment_content_257769\">\n" +
+            "  Me : Make a 2nd game ?\n" +
+            " <br>Dev : Nah man , too much work.\n" +
+            " <br>Me : So what's it gonna be ?\n" +
+            " <br>Dev : REMASTER !!!!\n" +
+            " <br>" +
+            "</div>" +
+            "<div><p type=\"child\">childtext</p></div>" +
+            "    </body>\n" +
+            "</html>";
+
     @Override
     @BeforeTest
     public void init() {
@@ -70,15 +73,20 @@ public class ParseHtmlTests extends RefineTest  {
     @Test
     public void testParseHtml() {
         Assert.assertTrue(invoke("parseHtml") instanceof EvalError);
-        Assert.assertTrue(invoke("parseHtml","h") instanceof org.jsoup.nodes.Document);
-        Assert.assertTrue(invoke("select",Jsoup.parse(h),"p") instanceof org.jsoup.select.Elements);
-        Assert.assertTrue(invoke("innerHtml",Jsoup.parse(h).select("p").first()) instanceof String);
-        Assert.assertEquals(invoke("innerHtml",Jsoup.parse(h).select("p").first()),"para1 <strong>strong text</strong>");
-        Assert.assertEquals(invoke("htmlAttr",Jsoup.parse(h).select("div").first(),"class"),"class1");
-        Assert.assertEquals(invoke("htmlText",Jsoup.parse(h).select("div").first()),"para1 strong text para2");
-        Assert.assertEquals(invoke("ownText",Jsoup.parse(h).select("p").first()),"para1");
-        Assert.assertTrue(invoke("wholeText",Jsoup.parse(h).select("div.commentthread_comment_text").first()) instanceof String);
-        Assert.assertEquals(invoke("wholeText",Jsoup.parse(h).select("div.commentthread_comment_text").first()),"\n  Me : Make a 2nd game ?\n Dev : Nah man , too much work.\n Me : So what's it gonna be ?\n Dev : REMASTER !!!!\n ");
+        Assert.assertTrue(invoke("parseHtml", "h") instanceof org.jsoup.nodes.Document);
+        Assert.assertTrue(invoke("select", Jsoup.parse(h), "p") instanceof org.jsoup.select.Elements);
+        Assert.assertTrue(invoke("innerHtml", Jsoup.parse(h).select("p").first()) instanceof String);
+        Assert.assertEquals(invoke("innerHtml", Jsoup.parse(h).select("p").first()), "para1 <strong>strong text</strong>");
+        Assert.assertEquals(invoke("htmlAttr", Jsoup.parse(h).select("div").first(), "class"), "class1");
+        Assert.assertEquals(invoke("htmlText", Jsoup.parse(h).select("div").first()), "para1 strong text para2");
+        Assert.assertEquals(invoke("ownText", Jsoup.parse(h).select("p").first()), "para1");
+        Assert.assertTrue(invoke("wholeText", Jsoup.parse(h).select("div.commentthread_comment_text").first()) instanceof String);
+        Assert.assertEquals(invoke("wholeText", Jsoup.parse(h).select("div.commentthread_comment_text").first()),
+                "\n  Me : Make a 2nd game ?\n Dev : Nah man , too much work.\n Me : So what's it gonna be ?\n Dev : REMASTER !!!!\n ");
+        Assert.assertEquals(invoke("parent", Jsoup.parse(h).select("p[type*=child]").first()).toString(),
+                "<div>\n <p type=\"child\">childtext</p>\n</div>");
+        Assert.assertEquals(invoke("scriptText", Jsoup.parse(h).select("script").first()), "One Two");
+        Assert.assertEquals(invoke("scriptText", Jsoup.parse(h).select("h1").first()), "");
+        Assert.assertTrue(invoke("scriptText", Jsoup.parse(h).select("p")) instanceof EvalError);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.java
index ac2524a08..cdbf1a35b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ChompTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertEquals;
@@ -34,6 +35,7 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class ChompTests extends RefineTest {
+
     @Test
     public void testChomp() {
         // FIXME: These return null instead of an EvalError
@@ -45,4 +47,3 @@ public class ChompTests extends RefineTest {
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java
index 04a930160..b45f420d8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ContainsTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import java.util.regex.Pattern;
@@ -50,16 +51,15 @@ public class ContainsTests extends RefineTest {
     @Test
     public void testContainsFunction() {
         String value = "rose is a rose";
-        Assert.assertEquals(invoke("contains", value, "rose"),true);
+        Assert.assertEquals(invoke("contains", value, "rose"), true);
 
         // Test if it does not interpret regex passed in String as Pattern
-        Assert.assertEquals(invoke("contains", value, "$"),false);
-        Assert.assertEquals(invoke("contains", value, "r.se"),false);
-        Assert.assertEquals(invoke("contains", value, "\\s+"),false);
+        Assert.assertEquals(invoke("contains", value, "$"), false);
+        Assert.assertEquals(invoke("contains", value, "r.se"), false);
+        Assert.assertEquals(invoke("contains", value, "\\s+"), false);
         // Input regex pattern in UI with : "/ /" , is interpreted as Pattern
-        Assert.assertEquals(invoke("contains", value, Pattern.compile("$")),true);
-        Assert.assertEquals(invoke("contains", value, Pattern.compile("\\s+")),true);
+        Assert.assertEquals(invoke("contains", value, Pattern.compile("$")), true);
+        Assert.assertEquals(invoke("contains", value, Pattern.compile("\\s+")), true);
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.java
index cca154d33..5f35a894b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/DiffTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import java.time.OffsetDateTime;
@@ -40,11 +41,10 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-
 public class DiffTests extends RefineTest {
 
     static Properties bindings;
-    
+
     private OffsetDateTime odt1;
     private OffsetDateTime odt2;
     private OffsetDateTime odt3;
@@ -53,7 +53,7 @@ public class DiffTests extends RefineTest {
     private OffsetDateTime odt6;
     private OffsetDateTime odt7;
     private OffsetDateTime odt8;
-    
+
     @Override
     @BeforeTest
     public void init() {
@@ -67,56 +67,59 @@ public class DiffTests extends RefineTest {
         odt7 = OffsetDateTime.of(1923, 4, 19, 12, 0, 0, 0, ZoneOffset.UTC);
         odt8 = OffsetDateTime.of(1923, 4, 21, 12, 0, 0, 0, ZoneOffset.UTC);
     }
-    
+
     @Test
-    public void testDiffInvalidParams() {        
+    public void testDiffInvalidParams() {
         Assert.assertTrue(invoke("diff") instanceof EvalError);
-        Assert.assertTrue(invoke("diff", "one","two","three") instanceof EvalError);
+        Assert.assertTrue(invoke("diff", "one", "two", "three") instanceof EvalError);
     }
-    
+
     @Test
-    public void testDiffString() {        
-        Assert.assertEquals((String)(invoke("diff", "onetwo","onetwothree")),"three");
-    }    
-     
+    public void testDiffString() {
+        Assert.assertEquals((String) (invoke("diff", "onetwo", "onetwothree")), "three");
+    }
+
     @Test
-    public void testDiffOffsetDateTime() {  
+    public void testDiffOffsetDateTime() {
         // OffsetDateTime diff:
-        Assert.assertEquals(invoke("diff",odt2,odt3,"years"),Long.valueOf(1));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"days"),Long.valueOf(92));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"weeks"),Long.valueOf(13));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"months"),Long.valueOf(3));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"hours"),Long.valueOf(2208));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"minutes"),Long.valueOf(132481));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"seconds"),Long.valueOf(7948860));
-        //Changed due to an error in previous version- it was checking for microseconds (1,000,000th of second) instead of milliseconds (1000th of second) 
-        Assert.assertEquals(invoke("diff",odt2,odt1,"milliseconds"),Long.valueOf(7948860000l));
-        Assert.assertEquals(invoke("diff",odt2,odt1,"nanos"),Long.valueOf(7948860000011000l));
+        Assert.assertEquals(invoke("diff", odt2, odt3, "years"), Long.valueOf(1));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "days"), Long.valueOf(92));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "weeks"), Long.valueOf(13));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "months"), Long.valueOf(3));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "hours"), Long.valueOf(2208));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "minutes"), Long.valueOf(132481));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "seconds"), Long.valueOf(7948860));
+        // Changed due to an error in previous version- it was checking for microseconds (1,000,000th of second) instead
+        // of milliseconds (1000th of second)
+        Assert.assertEquals(invoke("diff", odt2, odt1, "milliseconds"), Long.valueOf(7948860000l));
+        Assert.assertEquals(invoke("diff", odt2, odt1, "nanos"), Long.valueOf(7948860000011000l));
     }
-    
+
     @Test
     public void testDiffOffsetDateTimeEvalErrors() {
-        //Check whether EvalError is returned if time in nanoseconds between two dates is larger than long max in java when nanoseconds are desired unit.
+        // Check whether EvalError is returned if time in nanoseconds between two dates is larger than long max in java
+        // when nanoseconds are desired unit.
         Assert.assertTrue(invoke("diff", odt3, odt4, "nanos") instanceof EvalError);
         Assert.assertTrue(invoke("diff", odt4, odt5, "nanos") instanceof EvalError);
-        //At the same time if different time unit is requested for the same period, it should not result in EvalError.
-        Assert.assertEquals(invoke("diff", odt3, odt4, "milliseconds"), Long.valueOf(-31209840000000l));   
+        // At the same time if different time unit is requested for the same period, it should not result in EvalError.
+        Assert.assertEquals(invoke("diff", odt3, odt4, "milliseconds"), Long.valueOf(-31209840000000l));
         Assert.assertEquals(invoke("diff", odt4, odt5, "milliseconds"), Long.valueOf(22532428800000l));
         Assert.assertEquals(invoke("diff", odt3, odt4, "days"), Long.valueOf(-361225));
         Assert.assertEquals(invoke("diff", odt4, odt5, "days"), Long.valueOf(260792));
-        //Also, ensure that periods longer (in nanoseconds) than long max preserve continuity when expressed in different time unit, like days.
-        //Example: 1923-04-19 to 1700-01-01 is just below long max when expressed in nanoseconds
+        // Also, ensure that periods longer (in nanoseconds) than long max preserve continuity when expressed in
+        // different time unit, like days.
+        // Example: 1923-04-19 to 1700-01-01 is just below long max when expressed in nanoseconds
         Assert.assertEquals(invoke("diff", odt6, odt7, "days"), Long.valueOf(-81547));
         // and 1923-04-21 to 1700-01-01 is slightly above long max when expressed in nanoseconds
         Assert.assertEquals(invoke("diff", odt6, odt8, "days"), Long.valueOf(-81549));
     }
-    
+
     @Test
     public void testDiffOffsetDateTimeEvalErrorsForIncorrectTimeUnit() {
-        //In case if incorrect time unit is passed to function, EvalError should be returned
+        // In case if incorrect time unit is passed to function, EvalError should be returned
         Assert.assertTrue(invoke("diff", odt4, odt5, "milis") instanceof EvalError);
         Assert.assertTrue(invoke("diff", odt4, odt5, "millis") instanceof EvalError);
         Assert.assertTrue(invoke("diff", odt4, odt5, "yars") instanceof EvalError);
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.java
index 4c4be283e..8801fe6f9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EndsWithTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertFalse;
@@ -35,10 +36,10 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class EndsWithTests extends RefineTest {
+
     @Test
     public void testStartsWith() {
         assertTrue((Boolean) invoke("endsWith", "testString", "ing"));
         assertFalse((Boolean) invoke("startsWith", "testString", "banana"));
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.java
index 218149833..f824e9242 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/EscapeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertEquals;
@@ -35,16 +36,17 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class EscapeTests extends RefineTest {
+
     @Test
     public void testEscape() {
         assertNull(invoke("escape"));
-        assertEquals(invoke("escape",null,"xml"), "");
+        assertEquals(invoke("escape", null, "xml"), "");
         assertEquals(invoke("escape", "mystring", "html"), "mystring");
         assertEquals(invoke("escape", "mystring", "xml"), "mystring");
         assertEquals(invoke("escape", "mystring", "csv"), "mystring");
         assertEquals(invoke("escape", "mystring", "url"), "mystring");
         assertEquals(invoke("escape", "mystring", "javascript"), "mystring");
-        assertEquals(invoke("escape", 1, "html") ,"1");
+        assertEquals(invoke("escape", 1, "html"), "1");
         assertEquals(invoke("escape", 1, "xml"), "1");
         assertEquals(invoke("escape", 1, "csv"), "1");
         assertEquals(invoke("escape", 1, "url"), "1");
@@ -65,4 +67,3 @@ public class EscapeTests extends RefineTest {
         assertEquals("\"\"\"\"", invoke("escape", "\"", "csv")); // quotes get doubled
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.java
index 828b8c515..e6e3750fe 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FindTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import java.util.Properties;
@@ -42,8 +43,9 @@ import com.google.refine.util.TestUtils;
  * Test cases for find function.
  */
 public class FindTests extends RefineTest {
+
     static Properties bindings;
-    
+
     @Override
     @BeforeTest
     public void init() {
@@ -59,18 +61,18 @@ public class FindTests extends RefineTest {
         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");
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.java
index 8aa191414..fc9134659 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/FingerprintTests.java
@@ -41,45 +41,44 @@ import org.testng.annotations.Test;
 import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
-
 public class FingerprintTests extends RefineTest {
 
     static Properties bindings;
-    
+
     private static final String[][] testStrings = {
-        {"schön","schon"},  
+            { "schön", "schon" },
 //        {"Ære Øre Åre", "are aere ore"},
 //        {"Straße","strasse"},
-        {"\tABC \t DEF ","abc def"}, // test leading and trailing whitespace
-        {"bbb\taaa","aaa bbb"},
-        {"müller","muller"},
+            { "\tABC \t DEF ", "abc def" }, // test leading and trailing whitespace
+            { "bbb\taaa", "aaa bbb" },
+            { "müller", "muller" },
 //      {"müller","mueller"}, // another possible interpretation
 //        {"fiflij","fiflij"},
 //        {"ﭏ","אל"},
 //        {"œ ӕ","ae oe"},
-        {"",""},
+            { "", "" },
     };
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @Test
-    public void testInvalidParams() {        
+    public void testInvalidParams() {
         Assert.assertNull(invoke("fingerprint"));
-        Assert.assertNull(invoke("fingerprint", "one","two","three"));
+        Assert.assertNull(invoke("fingerprint", "one", "two", "three"));
         Assert.assertNull(invoke("fingerprint", Long.getLong("1")));
     }
-    
+
     @Test
     public void testNormalize() {
         for (String[] ss : testStrings) {
-            Assert.assertEquals(ss.length,2,"Invalid test"); // Not a valid test
-            Assert.assertEquals((String)(invoke("fingerprint", ss[0])),ss[1],
+            Assert.assertEquals(ss.length, 2, "Invalid test"); // Not a valid test
+            Assert.assertEquals((String) (invoke("fingerprint", ss[0])), ss[1],
                     "Fingerprint for string: " + ss[0] + " failed");
         }
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.java
index e7c25b662..51112b0ae 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/IndexOfTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class IndexOfTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.java
index fa1357593..b9ba15d78 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/LastIndexOfTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class LastIndexOfTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.java
index ce7f02c7a..8909a115d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MD5Tests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class MD5Tests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.java
index 409b2e669..dbd8418a9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/MatchTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class MatchTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.java
index 31658ecce..ce9f150ee 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramFingerprintTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class NGramFingerprintTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.java
index 5c15d8552..a63d4f5c3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/NGramTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class NGramTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.java
index a876da631..8f51db840 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ParseJsonTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class ParseJsonTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.java
index 180c6b1bf..12c9331ec 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PartitionTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class PartitionTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java
index 418fbacc5..a45ae70fa 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/PhoneticTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
+
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import com.google.refine.RefineTest;
@@ -32,14 +34,18 @@ import com.google.refine.util.TestUtils;
 import com.google.refine.expr.EvalError;
 
 public class PhoneticTests extends RefineTest {
-   
+
     @Test
     public void testtoPhoneticInvalidParams() {
-	Assert.assertTrue(invoke("phonetic") instanceof EvalError);                            //if no arguments are provided
-	Assert.assertTrue(invoke("phonetic",(Object[])null) instanceof EvalError);             //if first argument(value) is null
-	Assert.assertTrue(invoke("phonetic","one",(Object[])null) instanceof EvalError);       //if second argument(encoding type) is null
-	Assert.assertTrue(invoke("phonetic","one","other") instanceof EvalError);              //if second argument(encoding type) is not a valid encoding type
-	Assert.assertTrue(invoke("phonetic","one","metaphone3","three") instanceof EvalError); //if more than 2 arguments are provided
+        Assert.assertTrue(invoke("phonetic") instanceof EvalError); // if no arguments are provided
+        Assert.assertTrue(invoke("phonetic", (Object[]) null) instanceof EvalError); // if first argument(value) is null
+        Assert.assertTrue(invoke("phonetic", "one", (Object[]) null) instanceof EvalError); // if second
+                                                                                            // argument(encoding type)
+                                                                                            // is null
+        Assert.assertTrue(invoke("phonetic", "one", "other") instanceof EvalError); // if second argument(encoding type)
+                                                                                    // is not a valid encoding type
+        Assert.assertTrue(invoke("phonetic", "one", "metaphone3", "three") instanceof EvalError); // if more than 2
+                                                                                                  // arguments are
+                                                                                                  // provided
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.java
index 41663301e..bf0f5df5a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RPartitionTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class RPartitionTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.java
index adf47b59b..e27346fae 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/RangeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.slf4j.LoggerFactory;
@@ -42,15 +43,15 @@ public class RangeTests extends RefineTest {
 
     private static final Integer[] EMPTY_ARRAY = new Integer[0];
 
-    private static final Integer[] ONE_AND_THREE = new Integer[] {1, 3};
-    private static final Integer[] FIVE_AND_THREE = new Integer[] {5, 3};
+    private static final Integer[] ONE_AND_THREE = new Integer[] { 1, 3 };
+    private static final Integer[] FIVE_AND_THREE = new Integer[] { 5, 3 };
 
-    private static final Integer[] ZERO_TO_TWO = new Integer[] {0, 1, 2};
-    private static final Integer[] ONE_TO_FOUR = new Integer[] {1, 2, 3, 4};
-    private static final Integer[] FIVE_TO_TWO = new Integer[] {5, 4, 3, 2};
+    private static final Integer[] ZERO_TO_TWO = new Integer[] { 0, 1, 2 };
+    private static final Integer[] ONE_TO_FOUR = new Integer[] { 1, 2, 3, 4 };
+    private static final Integer[] FIVE_TO_TWO = new Integer[] { 5, 4, 3, 2 };
 
-    private static final Integer[] NEGATIVE_ONE_TO_FOUR = new Integer[] {-1, 0, 1, 2, 3, 4};
-    private static final Integer[] ONE_TO_NEGATIVE_FOUR = new Integer[] {1, 0, -1, -2, -3, -4};
+    private static final Integer[] NEGATIVE_ONE_TO_FOUR = new Integer[] { -1, 0, 1, 2, 3, 4 };
+    private static final Integer[] ONE_TO_NEGATIVE_FOUR = new Integer[] { 1, 0, -1, -2, -3, -4 };
 
     @Override
     @BeforeTest
@@ -59,7 +60,7 @@ public class RangeTests extends RefineTest {
     }
 
     @Test
-    public void testRangeInvalidParams() {        
+    public void testRangeInvalidParams() {
         // Test number of arguments
         Assert.assertTrue(invoke("range") instanceof EvalError);
         Assert.assertTrue(invoke("range", "") instanceof EvalError);
@@ -157,10 +158,10 @@ public class RangeTests extends RefineTest {
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "0"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "1"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "2", "1"))), EMPTY_ARRAY);
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "1"))), new Integer[] {-1, 0});
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "1"))), new Integer[] { -1, 0 });
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "5"))), ONE_TO_FOUR);
 
-        Assert.assertEquals(((Integer[]) (invoke("range", "  -1   ", "1"))), new Integer[] {-1, 0});
+        Assert.assertEquals(((Integer[]) (invoke("range", "  -1   ", "1"))), new Integer[] { -1, 0 });
         Assert.assertEquals(((Integer[]) (invoke("range", "1", " 5  "))), ONE_TO_FOUR);
 
         // Test valid double string containing three args
@@ -170,10 +171,10 @@ public class RangeTests extends RefineTest {
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5, 1"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5, 1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5, -1"))), ONE_TO_NEGATIVE_FOUR);
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5, 2"))), new Integer[] {-1, 1, 3});
-        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5, -2"))), new Integer[] {1, -1, -3});
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5, 10"))), new Integer[] {-1});
-        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5, -10"))), new Integer[] {1});
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5, 2"))), new Integer[] { -1, 1, 3 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5, -2"))), new Integer[] { 1, -1, -3 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5, 10"))), new Integer[] { -1 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5, -10"))), new Integer[] { 1 });
 
         Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", "0"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "0"))), EMPTY_ARRAY);
@@ -181,20 +182,21 @@ public class RangeTests extends RefineTest {
         Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "1"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", "1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "-1"))), ONE_TO_NEGATIVE_FOUR);
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", "2"))), new Integer[] {-1, 1, 3});
-        Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "-2"))), new Integer[] {1, -1, -3});
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", "10"))), new Integer[] {-1});
-        Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "-10"))), new Integer[] {1});
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", "2"))), new Integer[] { -1, 1, 3 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "-2"))), new Integer[] { 1, -1, -3 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", "10"))), new Integer[] { -1 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "1, -5", "-10"))), new Integer[] { 1 });
 
         Assert.assertEquals(((Integer[]) (invoke("range", "  -1  , 5", "1"))), NEGATIVE_ONE_TO_FOUR);
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1,   5"  , "1"))), NEGATIVE_ONE_TO_FOUR);
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1,   5", "1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "-1, 5", " 1   "))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "  -1  ", "5, 1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "-1", "  5  , 1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "  -1  ", "5,    1   "))), NEGATIVE_ONE_TO_FOUR);
     }
 
-    @Test public void testRangeValidTripleStringParams() {
+    @Test
+    public void testRangeValidTripleStringParams() {
         // Test valid triple string containing three arguments
         Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5", "0"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "0"))), EMPTY_ARRAY);
@@ -202,10 +204,10 @@ public class RangeTests extends RefineTest {
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "1"))), EMPTY_ARRAY);
         Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5", "1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "-1"))), ONE_TO_NEGATIVE_FOUR);
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5", "2"))), new Integer[] {-1, 1, 3});
-        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "-2"))), new Integer[] {1, -1, -3});
-        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5", "10"))), new Integer[] {-1});
-        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "-10"))), new Integer[] {1});
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5", "2"))), new Integer[] { -1, 1, 3 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "-2"))), new Integer[] { 1, -1, -3 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "-1", "5", "10"))), new Integer[] { -1 });
+        Assert.assertEquals(((Integer[]) (invoke("range", "1", "-5", "-10"))), new Integer[] { 1 });
 
         Assert.assertEquals(((Integer[]) (invoke("range", "  -1  , 5, 1"))), NEGATIVE_ONE_TO_FOUR);
         Assert.assertEquals(((Integer[]) (invoke("range", "-1,   5  , 1"))), NEGATIVE_ONE_TO_FOUR);
@@ -216,7 +218,7 @@ public class RangeTests extends RefineTest {
     public void testRangeValidIntegerParams() {
         // Test valid single integer argument
         Assert.assertEquals(((Integer[]) (invoke("range", 0))), EMPTY_ARRAY);
-        Assert.assertEquals(((Integer[]) (invoke("range", 5))), new Integer[] {0, 1, 2, 3, 4});
+        Assert.assertEquals(((Integer[]) (invoke("range", 5))), new Integer[] { 0, 1, 2, 3, 4 });
 
         // Test valid double integer arguments
         Assert.assertEquals(((Integer[]) (invoke("range", -1, 5))), NEGATIVE_ONE_TO_FOUR);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.java
index 0259761a8..0a89db578 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReinterpretTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class ReinterpretTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.java
index e95d9aafa..0989ef8d6 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceCharsTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class ReplaceCharsTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.java
index 106ba83b9..9c0337875 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ReplaceTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertEquals;
@@ -36,6 +37,7 @@ import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
 public class ReplaceTests extends RefineTest {
+
     @Test
     public void testReplace() {
         assertTrue(invoke("replace") instanceof EvalError);
@@ -50,4 +52,3 @@ public class ReplaceTests extends RefineTest {
         assertEquals(invoke("replace", "ripe ripe banana", "ripe", "green"), "green green banana");
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.java
index 3faab68cf..3fde5ecd0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SHA1Tests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class SHA1Tests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java
index 722b5c635..1922280ca 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertEquals;
@@ -83,7 +84,7 @@ public class SmartSplitTests {
         String[] actual = (String[]) invoke("smartSplit", testString, '#');
         assertEquals(expected, actual);
     }
-    
+
     @Test
     public void testSmartSplitCharSepSpace() {
         String testString = "teststring1 teststring2 teststring3 teststring4";
@@ -91,7 +92,7 @@ public class SmartSplitTests {
         String[] actual = (String[]) invoke("smartSplit", testString, ' ');
         assertEquals(expected, actual);
     }
-    
+
     @Test
     public void testSmartSplitStringSepGiven() {
         String testString = "teststring1#@$teststring2#@$teststring3#@$teststring4";
@@ -101,8 +102,7 @@ public class SmartSplitTests {
     }
 
     /**
-     * Lookup a control function by name and invoke it with a variable number of
-     * args
+     * 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
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.java
index 949a04d4f..b7b60cd83 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByCharTypeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class SplitByCharTypeTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.java
index 84fab937f..7db5c84bf 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitByLengthsTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class SplitByLengthsTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.java
index f1ca594d4..1f836abca 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/SplitTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertEquals;
@@ -34,12 +35,12 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class SplitTests extends RefineTest {
+
     @Test
     public void testSplit() {
-        assertEquals(invoke("split", "a,,b,c,d", ","), new String[] {"a", "b", "c", "d"});
-        assertEquals(invoke("split", "a,,b,c,d", ",", true), new String[] {"a", "", "b", "c", "d"});
+        assertEquals(invoke("split", "a,,b,c,d", ","), new String[] { "a", "b", "c", "d" });
+        assertEquals(invoke("split", "a,,b,c,d", ",", true), new String[] { "a", "", "b", "c", "d" });
         assertEquals(invoke("split", "", ","), new String[] {});
-        assertEquals(invoke("split", ",,,", ","), new String[] {""}); // TODO: Should this return an empty array?
+        assertEquals(invoke("split", ",,,", ","), new String[] { "" }); // TODO: Should this return an empty array?
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.java
index a35b742fa..babf7ad6d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/StartsWithTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertFalse;
@@ -35,10 +36,10 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class StartsWithTests extends RefineTest {
+
     @Test
     public void testStartsWith() {
         assertTrue((Boolean) invoke("startsWith", "testString", "test"));
         assertFalse((Boolean) invoke("startsWith", "testString", "banana"));
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.java
index 3f48f67a4..4ba8451a5 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToLowercaseTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.Assert;
@@ -34,20 +35,20 @@ import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
 public class ToLowercaseTests extends RefineTest {
+
     @Test
     public void testtoLowercaseInvalidParams() {
         Assert.assertTrue(invoke("toLowercase") instanceof EvalError);
-        Assert.assertTrue(invoke("toLowercase", (Object[])null) instanceof EvalError);
+        Assert.assertTrue(invoke("toLowercase", (Object[]) null) instanceof EvalError);
         Assert.assertTrue(invoke("toLowercase", "one", "two", "three") instanceof EvalError);
     }
 
     @Test
     public void testtoLowercase() {
-        Assert.assertEquals((String)(invoke("toLowercase", "One")), "one");
-        Assert.assertEquals((String)(invoke("toLowercase", "Ône")), "ône");
-        Assert.assertEquals((String)(invoke("toLowercase", "ONE")), "one");
-        Assert.assertEquals((String)(invoke("toLowercase", 1)), "1");
-        Assert.assertEquals((String)(invoke("toLowercase", true)), "true");
+        Assert.assertEquals((String) (invoke("toLowercase", "One")), "one");
+        Assert.assertEquals((String) (invoke("toLowercase", "Ône")), "ône");
+        Assert.assertEquals((String) (invoke("toLowercase", "ONE")), "one");
+        Assert.assertEquals((String) (invoke("toLowercase", 1)), "1");
+        Assert.assertEquals((String) (invoke("toLowercase", true)), "true");
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.java
index e2fdfc873..13a209acb 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToTitlecaseTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.Assert;
@@ -34,21 +35,21 @@ import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
 public class ToTitlecaseTests extends RefineTest {
+
     @Test
     public void testToTitlecaseInvalidParams() {
         Assert.assertTrue(invoke("toTitlecase") instanceof EvalError);
-        Assert.assertTrue(invoke("toTitlecase", "one","two","three") instanceof EvalError);
+        Assert.assertTrue(invoke("toTitlecase", "one", "two", "three") instanceof EvalError);
     }
 
     @Test
     public void testToTitlecase() {
-        Assert.assertEquals((String)(invoke("toTitlecase", "one")),"One");
-        Assert.assertEquals((String)(invoke("toTitlecase", "ONE")),"One");
-        Assert.assertEquals((String)(invoke("toTitlecase", "one two three")),"One Two Three");
-        Assert.assertEquals((String)(invoke("toTitlecase", "C.R. SANDIDGE WINES, INC.")),"C.R. Sandidge Wines, Inc.");
-        Assert.assertEquals((String)(invoke("toTitlecase", "C.R. SANDIDGE WINES, INC.",",. ")),"C.R. Sandidge Wines, Inc.");
-        Assert.assertEquals((String)(invoke("toTitlecase", "one-two-three","-")),"One-Two-Three");
+        Assert.assertEquals((String) (invoke("toTitlecase", "one")), "One");
+        Assert.assertEquals((String) (invoke("toTitlecase", "ONE")), "One");
+        Assert.assertEquals((String) (invoke("toTitlecase", "one two three")), "One Two Three");
+        Assert.assertEquals((String) (invoke("toTitlecase", "C.R. SANDIDGE WINES, INC.")), "C.R. Sandidge Wines, Inc.");
+        Assert.assertEquals((String) (invoke("toTitlecase", "C.R. SANDIDGE WINES, INC.", ",. ")), "C.R. Sandidge Wines, Inc.");
+        Assert.assertEquals((String) (invoke("toTitlecase", "one-two-three", "-")), "One-Two-Three");
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.java
index 6f6c4970a..3d062789c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/ToUppercaseTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class ToUppercaseTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.java
index 169a77e6d..b10e28e15 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/TrimTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.slf4j.LoggerFactory;
@@ -35,7 +36,6 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-
 public class TrimTests extends RefineTest {
 
     private static String NBSP = "\u00A0";
@@ -56,44 +56,44 @@ public class TrimTests extends RefineTest {
 //    private static String WDJOIN = "\u2060";
     private static String IDEOSPC = "\u3000";
 
-    private static String WHITESPACE = NBSP+ENQUAD+ENSPC+EMQUAD+EMSPC+N3PMSPC+N4PMSPC+N6PMSPC+FIGSP+PUNCSPC
-            +THINSPC+HAIRSPC+NNBSP+MDMMATHSPC
+    private static String WHITESPACE = NBSP + ENQUAD + ENSPC + EMQUAD + EMSPC + N3PMSPC + N4PMSPC + N6PMSPC + FIGSP + PUNCSPC
+            + THINSPC + HAIRSPC + NNBSP + MDMMATHSPC
 //            +ZWNBSP
 //            +WDJOIN
-            +IDEOSPC
-            ;
-    
+            + IDEOSPC;
+
     private static String[][] testStrings = {
-        {" foo ","foo"},  
-        {"\tfoo\t","foo"},  
-        {"\t \t foo \t \t","foo"},  
+            { " foo ", "foo" },
+            { "\tfoo\t", "foo" },
+            { "\t \t foo \t \t", "foo" },
 //        {WHITESPACE+"foo"+WHITESPACE,"foo"},  
-        {"",""},  
+            { "", "" },
     };
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @Test
-    public void testInvalidParams() {        
+    public void testInvalidParams() {
         Assert.assertTrue(invoke("trim") instanceof EvalError);
-        Assert.assertTrue(invoke("trim", "one","two","three") instanceof EvalError);
+        Assert.assertTrue(invoke("trim", "one", "two", "three") instanceof EvalError);
         Assert.assertTrue(invoke("trim", Long.getLong("1")) instanceof EvalError);
     }
-    
+
     @Test
     public void testTrim() {
         for (String[] ss : testStrings) {
-            Assert.assertEquals(ss.length,2,"Invalid test"); // Not a valid test
-            Assert.assertEquals((String)(invoke("trim", ss[0])),ss[1],"Trim for string: " + ss + " failed");
+            Assert.assertEquals(ss.length, 2, "Invalid test"); // Not a valid test
+            Assert.assertEquals((String) (invoke("trim", ss[0])), ss[1], "Trim for string: " + ss + " failed");
         }
 
-        for (int i=0; i < WHITESPACE.length(); i++) {
-            String c = WHITESPACE.substring(i,i+1);
-            Assert.assertEquals((String)(invoke("trim", c+"foo"+c)),"foo","Trim for whitespace char: '" + c + "' at index "+ i+ " failed");
+        for (int i = 0; i < WHITESPACE.length(); i++) {
+            String c = WHITESPACE.substring(i, i + 1);
+            Assert.assertEquals((String) (invoke("trim", c + "foo" + c)), "foo",
+                    "Trim for whitespace char: '" + c + "' at index " + i + " failed");
         }
 
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.java
index d010f3040..7e6977c31 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnescapeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import static org.testng.Assert.assertEquals;
@@ -34,16 +35,17 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class UnescapeTests extends RefineTest {
+
     @Test
     public void testUnescape() {
         assertEquals(invoke("unescape", "&Auml;", "html"), "Ä");
         assertEquals(invoke("unescape", "\\u00C4", "javascript"), "Ä");
 
-        assertEquals(invoke("unescape", "\"Test\"", "csv"), "Test"); // Apache TEXT-149 https://github.com/apache/commons-text/pull/119
+        assertEquals(invoke("unescape", "\"Test\"", "csv"), "Test"); // Apache TEXT-149
+                                                                     // https://github.com/apache/commons-text/pull/119
         assertEquals(invoke("unescape", "\"This \"\"is\"\" a test\"", "csv"), "This \"is\" a test");
         assertEquals(invoke("unescape", "\"\n\"", "csv"), "\n");
         assertEquals(invoke("unescape", "\"a, b\"", "csv"), "a, b");
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.java
index 419d175c0..c6c05a58b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class UnicodeTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.java
index d2a1fd977..dc2d1b964 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/strings/UnicodeTypeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.strings;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class UnicodeTypeTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.java
index c19f49cea..a117577c8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/InnerXmlTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.xml;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class InnerXmlTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.java
index 770eac7ba..c95129d94 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/OwnTextTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.xml;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class OwnTextTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.java
index a1d5dc699..f0f50a156 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/ParseXmlTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.xml;
 
 import org.jsoup.parser.Parser;
@@ -40,27 +41,26 @@ import com.google.refine.RefineTest;
 import com.google.refine.expr.EvalError;
 import com.google.refine.util.TestUtils;
 
-
 public class ParseXmlTests extends RefineTest {
-    
+
     static Properties bindings;
-    static String x =   "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                        "<root xmlns:foaf=\"http://xmlns.com/foaf/0.1/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
-                        "    <foaf:Person>\n" +
-                        "        <foaf:name>John Doe</foaf:name>\n" +
-                        "        <head>head1</head>\n" +
-                        "        <head>head2</head>\n" +
-                        "        <BODY>body1</BODY>\n" +
-                        "        <foaf:homepage rdf:resource=\"http://www.example.com\"/>\n" +
-                        "    </foaf:Person>\n" +
-                        "    <foaf:Person>\n" +
-                        "        <foaf:name>Héloïse Dupont</foaf:name>\n" +
-                        "        <head>head3</head>\n" +
-                        "        <BODY>body2</BODY>\n" +
-                        "        <foaf:title/>\n" +
-                        "    </foaf:Person>\n" +
-                        "</root>";
-    
+    static String x = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+            "<root xmlns:foaf=\"http://xmlns.com/foaf/0.1/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n" +
+            "    <foaf:Person>\n" +
+            "        <foaf:name>John Doe</foaf:name>\n" +
+            "        <head>head1</head>\n" +
+            "        <head>head2</head>\n" +
+            "        <BODY>body1</BODY>\n" +
+            "        <foaf:homepage rdf:resource=\"http://www.example.com\"/>\n" +
+            "    </foaf:Person>\n" +
+            "    <foaf:Person>\n" +
+            "        <foaf:name>Héloïse Dupont</foaf:name>\n" +
+            "        <head>head3</head>\n" +
+            "        <BODY>body2</BODY>\n" +
+            "        <foaf:title/>\n" +
+            "    </foaf:Person>\n" +
+            "</root>";
+
     @Override
     @BeforeTest
     public void init() {
@@ -70,12 +70,14 @@ public class ParseXmlTests extends RefineTest {
     @Test
     public void testParseXml() {
         Assert.assertTrue(invoke("parseXml") instanceof EvalError);
-        Assert.assertTrue(invoke("parseXml","x") instanceof org.jsoup.nodes.Document);
-        Assert.assertTrue(invoke("select",Jsoup.parse(x,"",Parser.xmlParser()),"foaf|Person") instanceof org.jsoup.select.Elements);
-        Assert.assertEquals(invoke("innerXml",Jsoup.parse(x,"",Parser.xmlParser()).select("foaf|Person").first()),"<foaf:name>John Doe</foaf:name>\n<head>head1</head>\n<head>head2</head>\n<BODY>body1</BODY>\n<foaf:homepage rdf:resource=\"http://www.example.com\" />");
-        Assert.assertEquals(invoke("xmlAttr",Jsoup.parse(x,"",Parser.xmlParser()).select("foaf|homepage").first(),"rdf:resource"),"http://www.example.com");
-        Assert.assertEquals(invoke("ownText",Jsoup.parse(x,"",Parser.xmlParser()).select("BODY").first()),"body1");
-        Assert.assertEquals(invoke("xmlText",Jsoup.parse(x,"",Parser.xmlParser()).select("foaf|Person").first()),"John Doe head1 head2 body1");
+        Assert.assertTrue(invoke("parseXml", "x") instanceof org.jsoup.nodes.Document);
+        Assert.assertTrue(invoke("select", Jsoup.parse(x, "", Parser.xmlParser()), "foaf|Person") instanceof org.jsoup.select.Elements);
+        Assert.assertEquals(invoke("innerXml", Jsoup.parse(x, "", Parser.xmlParser()).select("foaf|Person").first()),
+                "<foaf:name>John Doe</foaf:name>\n<head>head1</head>\n<head>head2</head>\n<BODY>body1</BODY>\n<foaf:homepage rdf:resource=\"http://www.example.com\" />");
+        Assert.assertEquals(invoke("xmlAttr", Jsoup.parse(x, "", Parser.xmlParser()).select("foaf|homepage").first(), "rdf:resource"),
+                "http://www.example.com");
+        Assert.assertEquals(invoke("ownText", Jsoup.parse(x, "", Parser.xmlParser()).select("BODY").first()), "body1");
+        Assert.assertEquals(invoke("xmlText", Jsoup.parse(x, "", Parser.xmlParser()).select("foaf|Person").first()),
+                "John Doe head1 head2 body1");
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.java
index 9f4e2a8e5..5c4428fda 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/functions/xml/SelectXmlTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.functions.xml;
 
 import org.testng.annotations.Test;
@@ -32,4 +33,3 @@ import com.google.refine.util.TestUtils;
 
 public class SelectXmlTests {
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java
index fff4e2d09..dd3d35b39 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.expr.util;
 
 import static org.testng.Assert.assertEquals;
@@ -36,53 +37,53 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.refine.util.ParsingUtilities;
 
 public class JsonValueConverterTests {
-	
-	private void fieldEquals(String json, Object expectedValue) {
-		try {
-			ObjectNode n = (ObjectNode) ParsingUtilities.mapper.readTree(json);
-			assertEquals(expectedValue, JsonValueConverter.convert(n.get("foo")));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testConvertJsonObject() throws IOException {
-		fieldEquals("{\"foo\":{\"ob\":\"ject\"}}", ParsingUtilities.mapper.readTree("{\"ob\":\"ject\"}"));
-	}
-	
-	@Test
-	public void testConvertJsonArray() throws IOException {
-		fieldEquals("{\"foo\":[1,2]}", ParsingUtilities.mapper.readTree("[1,2]"));
-	}
-	
-	@Test
-	public void testConvertInt() {
-		fieldEquals("{\"foo\":3}", 3);
-	}
-	
-	@Test
-	public void testConvertFloat() {
-		fieldEquals("{\"foo\":3.14}", 3.14);
-	}
-	
-	@Test
-	public void testConvertBool() {
-		fieldEquals("{\"foo\":true}", true);
-	}
 
-	@Test
-	public void testConvertNull() {
-		fieldEquals("{\"foo\":null}", null);
-	}
-	
-	@Test
-	public void testConvertString() {
-		fieldEquals("{\"foo\":\"bar\"}", "bar");
-	}
-	
-	@Test
-	public void testConvertNoField() {
-		fieldEquals("{}", null);
-	}
+    private void fieldEquals(String json, Object expectedValue) {
+        try {
+            ObjectNode n = (ObjectNode) ParsingUtilities.mapper.readTree(json);
+            assertEquals(expectedValue, JsonValueConverter.convert(n.get("foo")));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testConvertJsonObject() throws IOException {
+        fieldEquals("{\"foo\":{\"ob\":\"ject\"}}", ParsingUtilities.mapper.readTree("{\"ob\":\"ject\"}"));
+    }
+
+    @Test
+    public void testConvertJsonArray() throws IOException {
+        fieldEquals("{\"foo\":[1,2]}", ParsingUtilities.mapper.readTree("[1,2]"));
+    }
+
+    @Test
+    public void testConvertInt() {
+        fieldEquals("{\"foo\":3}", 3);
+    }
+
+    @Test
+    public void testConvertFloat() {
+        fieldEquals("{\"foo\":3.14}", 3.14);
+    }
+
+    @Test
+    public void testConvertBool() {
+        fieldEquals("{\"foo\":true}", true);
+    }
+
+    @Test
+    public void testConvertNull() {
+        fieldEquals("{\"foo\":null}", null);
+    }
+
+    @Test
+    public void testConvertString() {
+        fieldEquals("{\"foo\":\"bar\"}", "bar");
+    }
+
+    @Test
+    public void testConvertNoField() {
+        fieldEquals("{}", null);
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/FunctionTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/FunctionTests.java
index 481cc5429..2c34936dc 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/FunctionTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/FunctionTests.java
@@ -30,7 +30,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  */
- 
+
 package com.google.refine.grel;
 
 import static org.testng.Assert.assertEquals;
@@ -59,8 +59,8 @@ import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
 
-
 public class FunctionTests extends RefineTest {
+
     Project project;
     Engine engine;
 
@@ -69,7 +69,7 @@ public class FunctionTests extends RefineTest {
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @BeforeMethod
     public void SetUp() throws IOException, ModelException {
         project = createProjectWithColumns("FunctionTests", "Column A");
@@ -79,29 +79,28 @@ public class FunctionTests extends RefineTest {
         // Five rows of a's and five of 1s
         for (int i = 0; i < 10; i++) {
             Row row = new Row(1);
-            row.setCell(0, new Cell(i < 5 ? "a":new Integer(1), null));
+            row.setCell(0, new Cell(i < 5 ? "a" : new Integer(1), null));
             project.rows.add(row);
         }
     }
 
-
     @AfterMethod
     public void TearDown() {
         bindings = null;
     }
 
     @Test
-    public void testInvalidParams() {        
+    public void testInvalidParams() {
         Assert.assertTrue(invoke("facetCount") instanceof EvalError);
-        Assert.assertTrue(invoke("facetCount", "one","two","three") instanceof EvalError);
-        Assert.assertTrue(invoke("facetCount", "one","bad(","Column A") instanceof EvalError);
+        Assert.assertTrue(invoke("facetCount", "one", "two", "three") instanceof EvalError);
+        Assert.assertTrue(invoke("facetCount", "one", "bad(", "Column A") instanceof EvalError);
     }
 
     @Test
-    public void testFacetCount() {        
-        Assert.assertEquals(invoke("facetCount", "a", "value", "Column A"),Integer.valueOf(5));
-        Assert.assertEquals(invoke("facetCount", new Integer(1), "value", "Column A"),Integer.valueOf(5));
-        Assert.assertEquals(invoke("facetCount", new Integer(2), "value+1", "Column A"),Integer.valueOf(5));
+    public void testFacetCount() {
+        Assert.assertEquals(invoke("facetCount", "a", "value", "Column A"), Integer.valueOf(5));
+        Assert.assertEquals(invoke("facetCount", new Integer(1), "value", "Column A"), Integer.valueOf(5));
+        Assert.assertEquals(invoke("facetCount", new Integer(2), "value+1", "Column A"), Integer.valueOf(5));
     }
 
     @Test
@@ -111,8 +110,7 @@ public class FunctionTests extends RefineTest {
         Set<String> returnsNull = new HashSet<>(Arrays.asList("chomp", "contains", "escape", "unescape", "exp",
                 "fingerprint", "get", "parseJson", "partition", "pow", "rpartition",
                 "slice", "substring", // synonyms for Slice
-                "unicode", "unicodeType"
-                ));
+                "unicode", "unicodeType"));
         Set<String> returnsFalse = new HashSet<>(Arrays.asList("hasField"));
 
         for (Entry<String, Function> entry : ControlFunctionRegistry.getFunctionMapping()) {
@@ -134,16 +132,15 @@ public class FunctionTests extends RefineTest {
         Set<String> returnsNull = new HashSet<>(Arrays.asList("chomp", "contains", "coalesce", "escape", "unescape",
                 "exp", "fingerprint", "get", "now", "parseJson", "partition", "pow", "rpartition",
                 "slice", "substring", // synonyms for Slice
-                "unicode", "unicodeType"
-                ));
+                "unicode", "unicodeType"));
         Set<String> returnsFalse = new HashSet<>(Arrays.asList("hasField"));
         Set<String> exempt = new HashSet<>(Arrays.asList(
                 "jsonize" // returns literal string "null"
-                ));
+        ));
         for (Entry<String, Function> entry : ControlFunctionRegistry.getFunctionMapping()) {
             Function func = entry.getValue();
             // No functions take 8 arguments, so they should all error
-            Object result = func.call(bindings, new Object[] {null, null, null, null, null, null, null, null});
+            Object result = func.call(bindings, new Object[] { null, null, null, null, null, null, null, null });
             if (returnsNull.contains(ControlFunctionRegistry.getFunctionName(func))) {
                 assertNull(result, ControlFunctionRegistry.getFunctionName(func) + " didn't return null on 8 args");
             } else if (returnsFalse.contains(ControlFunctionRegistry.getFunctionName(func))) {
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/GrelTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/GrelTests.java
index c74eceec5..d4de1ebaa 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/GrelTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/GrelTests.java
@@ -54,14 +54,13 @@ public class GrelTests extends RefineTest {
 
     Project project;
     Properties bindings;
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-
     @BeforeMethod
     public void SetUp() {
         project = new Project();
@@ -86,10 +85,10 @@ public class GrelTests extends RefineTest {
                 "value}datePart()",
                 "value.datePart{}",
 //                "2^3" // TODO: Should this generate an error?
-                };
+        };
         for (String test : tests) {
-            try{
-                MetaParser.parse("grel:"+test);
+            try {
+                MetaParser.parse("grel:" + test);
             } catch (ParsingException e) {
                 // Test succeeded
                 continue;
@@ -103,40 +102,40 @@ public class GrelTests extends RefineTest {
         String tests[] = {
 //                "1=1", // TODO: Throws NullPointerException
                 "value.datePart()",
-                };
+        };
         for (String test : tests) {
             try {
                 Evaluable eval = MetaParser.parse("grel:" + test);
                 Object result = eval.evaluate(bindings);
-                Assert.assertTrue(result instanceof EvalError );
+                Assert.assertTrue(result instanceof EvalError);
             } catch (ParsingException e) {
-                Assert.fail("Unexpected parse failure: " + test);                
+                Assert.fail("Unexpected parse failure: " + test);
             }
         }
     }
-    
+
     @Test
     public void testMath() throws ParsingException {
-        String tests[][] = { 
-                { "1", "1" }, 
-                { "1 + 1", "2" }, 
-                { "1 + 1 + 1", "3" }, 
-                { "1-1-1", "-1" }, 
-                { "1-2-3", "-4" }, 
-                { "1-(2-3)", "2" }, 
-                { "2*3", "6" }, 
-                { "3%2", "1" }, 
+        String tests[][] = {
+                { "1", "1" },
+                { "1 + 1", "2" },
+                { "1 + 1 + 1", "3" },
+                { "1-1-1", "-1" },
+                { "1-2-3", "-4" },
+                { "1-(2-3)", "2" },
+                { "2*3", "6" },
+                { "3%2", "1" },
                 { "3/2", "1" },
-                { "3.0/2", "1.5" }, 
-                { "1==1", "true" }, 
-                { "1==2", "false" }, 
-                { "1>2", "false" }, 
-                { "1<2", "true" }, 
-                { "1>1", "false" }, 
-                { "1>=1", "true" }, 
-                { "1<=2", "true" }, 
-                { "2<=2", "true" }, 
-                { "3<=2", "false" }, 
+                { "3.0/2", "1.5" },
+                { "1==1", "true" },
+                { "1==2", "false" },
+                { "1>2", "false" },
+                { "1<2", "true" },
+                { "1>1", "false" },
+                { "1>=1", "true" },
+                { "1<=2", "true" },
+                { "2<=2", "true" },
+                { "3<=2", "false" },
 //                { "", "" }, 
         };
         for (String[] test : tests) {
@@ -152,18 +151,18 @@ public class GrelTests extends RefineTest {
 
     @Test
     public void testString() throws ParsingException {
-        String tests[][] = { 
-                { "1", "1" }, 
-                { "1 + 1", "2" }, 
-                { "1 + 1 + 1", "3" }, 
-                { "1-1-1", "-1" }, 
-                { "1-2-3", "-4" }, 
-                { "1-(2-3)", "2" }, 
-                { "2*3", "6" }, 
-                { "3%2", "1" }, 
+        String tests[][] = {
+                { "1", "1" },
+                { "1 + 1", "2" },
+                { "1 + 1 + 1", "3" },
+                { "1-1-1", "-1" },
+                { "1-2-3", "-4" },
+                { "1-(2-3)", "2" },
+                { "2*3", "6" },
+                { "3%2", "1" },
                 { "3/2", "1" },
-                { "3.0/2", "1.5" }, 
-                { "1", "1" }, 
+                { "3.0/2", "1.5" },
+                { "1", "1" },
         };
         for (String[] test : tests) {
             parseEval(bindings, test);
@@ -178,23 +177,23 @@ public class GrelTests extends RefineTest {
 
     @Test
     public void testGetFieldFromNull() throws ParsingException {
-        String test =  "null.value";
+        String test = "null.value";
         Evaluable eval = MetaParser.parse("grel:" + test);
         Assert.assertNull(eval.evaluate(bindings));
     }
-    
+
     // to demonstrate bug fixing for #1204
     @Test
     public void testCrossFunctionEval() {
-            String test = "cross(\"Mary\", \"My Address Book\", \"friend\")";
-            
-            try {
-                Evaluable eval = MetaParser.parse("grel:" + test);
-                Object result = eval.evaluate(bindings);
-                Assert.assertTrue(result instanceof EvalError );
-            } catch (ParsingException e) {
-                Assert.fail("Unexpected parse failure for cross function: " + test);                
-            }
+        String test = "cross(\"Mary\", \"My Address Book\", \"friend\")";
+
+        try {
+            Evaluable eval = MetaParser.parse("grel:" + test);
+            Object result = eval.evaluate(bindings);
+            Assert.assertTrue(result instanceof EvalError);
+        } catch (ParsingException e) {
+            Assert.fail("Unexpected parse failure for cross function: " + test);
+        }
     }
 
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.java
index 16b55699c..746bd98c8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/ast/LiteralExprTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.ast;
 
 import static org.testng.Assert.assertEquals;
@@ -31,15 +32,16 @@ import static org.testng.Assert.assertEquals;
 import org.testng.annotations.Test;
 
 public class LiteralExprTest {
-	@Test
-	public void intLiteralToString() {
-		LiteralExpr expr = new LiteralExpr(42);
-		assertEquals("42", expr.toString());
-	}
-	
-	@Test
-	public void stringLiteralToString() {
-		LiteralExpr expr = new LiteralExpr("string with \"\\backslash\"");
-		assertEquals("\"string with \\\"\\\\backslash\\\"\"", expr.toString());
-	}
+
+    @Test
+    public void intLiteralToString() {
+        LiteralExpr expr = new LiteralExpr(42);
+        assertEquals("42", expr.toString());
+    }
+
+    @Test
+    public void stringLiteralToString() {
+        LiteralExpr expr = new LiteralExpr("string with \"\\backslash\"");
+        assertEquals("\"string with \\\"\\\\backslash\\\"\"", expr.toString());
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/FilterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/FilterTests.java
index ef7901f55..0b9837c3f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/FilterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/FilterTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class FilterTests {
+
     @Test
     public void serializeFilter() {
         String json = "{\"description\":\"Evaluates expression a to an array. Then for each array element, binds its value to variable name v, evaluates expression test which should return a boolean. If the boolean is true, pushes v onto the result array.\",\"params\":\"expression a, variable v, expression test\",\"returns\":\"array\"}";
         TestUtils.isSerializedTo(new Filter(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java
index bd11af612..d2d353cbf 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ForEachIndexTests {
+
     @Test
     public void serializeForEachIndex() {
         String json = "{\"description\":\"Evaluates expression a to an array. Then for each array element, binds its index to variable i and its value to variable name v, evaluates expression e, and pushes the result onto the result array.\",\"params\":\"expression a, variable i, variable v, expression e\",\"returns\":\"array\"}";
         TestUtils.isSerializedTo(new ForEachIndex(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachTests.java
index 2c2aac1a3..587547998 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForEachTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import static org.testng.Assert.assertTrue;
@@ -41,6 +42,7 @@ import com.google.refine.expr.ParsingException;
 import com.google.refine.util.TestUtils;
 
 public class ForEachTests extends RefineTest {
+
     @Test
     public void serializeForEach() {
         String json = "{\"description\":\"Evaluates expression a to an array. Then for each array element, binds its value to variable name v, evaluates expression e, and pushes the result onto the result array.\",\"params\":\"expression a, variable v, expression e\",\"returns\":\"array\"}";
@@ -61,15 +63,18 @@ public class ForEachTests extends RefineTest {
         try {
             assertParseError("forEach([], 1, 1)");
             fail("Didn't throw a ParsingException for wrong argument type");
-        } catch (ParsingException e) {}
+        } catch (ParsingException e) {
+        }
         try {
             assertParseError("forEach([], v)");
             fail("Didn't throw a ParsingException for 2 arguments");
-        } catch (ParsingException e) {}
+        } catch (ParsingException e) {
+        }
         try {
             assertParseError("forEach([])");
             fail("Didn't throw a ParsingException for 1 argument");
-        } catch (ParsingException e) {}
+        } catch (ParsingException e) {
+        }
     }
 
     @Test
@@ -80,7 +85,7 @@ public class ForEachTests extends RefineTest {
                 + "\"8706\": {\"parent_area\": 2511, \"generation_high\": 40, \"all_names\": {}, \"id\": 8706, \"codes\": {\"ons\": \"00ABGH\", \"gss\": \"E05000036\", \"unit_id\": \"10936\"}, \"name\": \"Mayesbrook\", \"country\": \"E\", \"type_name\": \"London borough ward\", \"generation_low\": 1, \"country_name\": \"England\", \"type\": \"LBW\"}"
                 + "}";
 
-        String test[] =  {"forEach('" + json + "'.parseJson(), v, v.id).sort().join(',')", "2247,2511,8706"};
+        String test[] = { "forEach('" + json + "'.parseJson(), v, v.id).sort().join(',')", "2247,2511,8706" };
         bindings = new Properties();
         bindings.put("v", "");
         parseEval(bindings, test);
@@ -88,7 +93,7 @@ public class ForEachTests extends RefineTest {
 
     @Test
     public void testForEachArray() throws ParsingException {
-        String test[] =  {"forEach([5,4,3,2.0], v, v*2).join(',')", "10,8,6,4.0"};
+        String test[] = { "forEach([5,4,3,2.0], v, v*2).join(',')", "10,8,6,4.0" };
         bindings = new Properties();
         bindings.put("v", "");
         parseEval(bindings, test);
@@ -96,10 +101,9 @@ public class ForEachTests extends RefineTest {
 
     @Test
     public void testForEachJsonArray() throws ParsingException {
-        String test[] =  {"forEach('[3,2,1.0]'.parseJson(), v, v*2).join(',')", "6,4,2.0"};
+        String test[] = { "forEach('[3,2,1.0]'.parseJson(), v, v*2).join(',')", "6,4,2.0" };
         bindings = new Properties();
         bindings.put("v", "");
         parseEval(bindings, test);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.java
index 4cfd196d0..84260f870 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForNonBlankTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ForNonBlankTests {
+
     @Test
     public void serializeForNonBlank() {
         String json = "{\"description\":\"Evaluates expression o. If it is non-blank, binds its value to variable name v, evaluates expression eNonBlank and returns the result. Otherwise (if o evaluates to blank), evaluates expression eBlank and returns that result instead.\",\"params\":\"expression o, variable v, expression eNonBlank, expression eBlank\",\"returns\":\"Depends on actual arguments\"}";
         TestUtils.isSerializedTo(new ForNonBlank(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.java
index ed0867b5b..4dc3b0852 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/ForRangeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ForRangeTests {
+
     @Test
     public void serializeForRange() {
         String json = "{\"description\":\"Iterates over the variable v starting at \\\"from\\\", incrementing by \\\"step\\\" each time while less than \\\"to\\\". At each iteration, evaluates expression e, and pushes the result onto the result array.\",\"params\":\"number from, number to, number step, variable v, expression e\",\"returns\":\"array\"}";
         TestUtils.isSerializedTo(new ForRange(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IfTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IfTests.java
index 6c4c4a3db..7249ca08f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IfTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IfTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IfTests {
+
     @Test
     public void serializeIf() {
         String json = "{\"description\":\"Evaluates expression o. If it is true, evaluates expression eTrue and returns the result. Otherwise, evaluates expression eFalse and returns that result instead.\",\"params\":\"expression o, expression eTrue, expression eFalse\",\"returns\":\"Depends on actual arguments\"}";
         TestUtils.isSerializedTo(new If(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.java
index eed0fbb96..1fac61aba 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsBlankTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsBlankTests {
+
     @Test
     public void serializeIsBlank() {
         String json = "{\"description\":\"Returns whether o is null or an empty string\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsBlank(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.java
index 27f57605b..c3420c6ef 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsEmptyStringTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsEmptyStringTests {
+
     @Test
     public void serializeIsEmptyString() {
         String json = "{\"description\":\"Returns whether o is an empty string\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsEmptyString(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.java
index 8d760a452..a3d0d1cd8 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsErrorTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsErrorTests {
+
     @Test
     public void serializeIsError() {
         String json = "{\"description\":\"Returns whether o is an error\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsError(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.java
index fffc039f4..44cb54375 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNonBlankTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsNonBlankTests {
+
     @Test
     public void serializeIsNonBlank() {
         String json = "{\"description\":\"Returns whether o is not null and not an empty string\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsNonBlank(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.java
index f1d45d1af..66373553a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNotNullTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsNotNullTests {
+
     @Test
     public void serializeIsNotNull() {
         String json = "{\"description\":\"Returns whether o is not null\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsNotNull(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNullTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNullTests.java
index 7f827a504..b2f0f60f3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNullTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNullTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsNullTests {
+
     @Test
     public void serializeIsNull() {
         String json = "{\"description\":\"Returns whether o is null\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsNull(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.java
index f15397258..4277b5dec 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/IsNumericTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class IsNumericTests {
+
     @Test
     public void serializeIsNumeric() {
         String json = "{\"description\":\"Returns whether o can represent a number\",\"params\":\"expression o\",\"returns\":\"boolean\"}";
         TestUtils.isSerializedTo(new IsNumeric(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/WithTests.java b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/WithTests.java
index 82f24a3d6..28b90d87e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/WithTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/grel/controls/WithTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.grel.controls;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class WithTests {
+
     @Test
     public void serializeWith() {
         String json = "{\"description\":\"Evaluates expression o and binds its value to variable name v. Then evaluates expression e and returns that result\",\"params\":\"expression o, variable v, expression e\",\"returns\":\"Depends on actual arguments\"}";
         TestUtils.isSerializedTo(new With(), json);
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java b/OpenRefine/main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java
index 65c842f4b..96d300456 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/history/FileHistoryEntryManagerTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.history;
 
 import static org.mockito.Mockito.mock;
@@ -17,23 +18,23 @@ import com.google.refine.operations.column.ColumnAdditionOperation;
 import com.google.refine.util.TestUtils;
 
 public class FileHistoryEntryManagerTests extends RefineTest {
-	
-	Project project;
-	FileHistoryEntryManager sut = new FileHistoryEntryManager();
-	
+
+    Project project;
+    FileHistoryEntryManager sut = new FileHistoryEntryManager();
+
     @BeforeMethod
     public void setUp() {
         project = mock(Project.class);
         OperationRegistry.registerOperation(getCoreModule(), "column-addition", ColumnAdditionOperation.class);
     }
-    
-	@Test
-	public void testWriteHistoryEntry() throws IOException {
-		StringWriter writer = new StringWriter();
-		HistoryEntry historyEntry = HistoryEntry.load(project, HistoryEntryTests.fullJson);
-		Properties options = new Properties();
-		options.setProperty("mode", "save");
-		sut.save(historyEntry, writer, options);
-		TestUtils.equalAsJson(HistoryEntryTests.fullJson, writer.toString());
-	}
+
+    @Test
+    public void testWriteHistoryEntry() throws IOException {
+        StringWriter writer = new StringWriter();
+        HistoryEntry historyEntry = HistoryEntry.load(project, HistoryEntryTests.fullJson);
+        Properties options = new Properties();
+        options.setProperty("mode", "save");
+        sut.save(historyEntry, writer, options);
+        TestUtils.equalAsJson(HistoryEntryTests.fullJson, writer.toString());
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryEntryTests.java b/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryEntryTests.java
index 73eaf8cb8..79b34102b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryEntryTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryEntryTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.history;
 
 import static org.mockito.Mockito.mock;
@@ -41,7 +42,7 @@ import com.google.refine.operations.column.ColumnAdditionOperation;
 import com.google.refine.util.TestUtils;
 
 public class HistoryEntryTests extends RefineTest {
-	
+
     public static final String fullJson = "{"
             + "\"id\":1533633623158,"
             + "\"description\":\"Create new column uri based on column country by filling 269 rows with grel:\\\"https://www.wikidata.org/wiki/\\\"+cell.recon.match.id\","
@@ -55,29 +56,29 @@ public class HistoryEntryTests extends RefineTest {
             + "   \"expression\":\"grel:\\\"https://www.wikidata.org/wiki/\\\"+cell.recon.match.id\","
             + "   \"onError\":\"set-to-blank\"}"
             + "}";
-    
-	public static final String unknownOperationJson = "{"
+
+    public static final String unknownOperationJson = "{"
             + "\"id\":1533633623158,"
             + "\"description\":\"some mysterious operation\","
             + "\"time\":\"2018-08-07T09:06:37Z\","
             + "\"operation\":{\"op\":\"someextension/unknown-operation\","
             + "   \"description\":\"some mysterious operation\","
             + "   \"some_parameter\":234\n"
-		    + "}\n"
+            + "}\n"
             + "}";
-    
+
     Project project;
-    
+
     @BeforeTest
     public void register() {
         OperationRegistry.registerOperation(getCoreModule(), "column-addition", ColumnAdditionOperation.class);
     }
-    
+
     @BeforeMethod
     public void setUp() {
         project = mock(Project.class);
     }
-    
+
     @Test
     public void serializeHistoryEntry() throws Exception {
         String json = "{\"id\":1533651837506,"
@@ -85,23 +86,23 @@ public class HistoryEntryTests extends RefineTest {
                 + "\"time\":\"2018-08-07T14:18:29Z\"}";
         TestUtils.isSerializedTo(HistoryEntry.load(project, json), json);
     }
-    
+
     @Test
     public void serializeHistoryEntryWithOperation() throws Exception {
         String jsonSimple = "{"
                 + "\"id\":1533633623158,"
                 + "\"description\":\"Create new column uri based on column country by filling 269 rows with grel:\\\"https://www.wikidata.org/wiki/\\\"+cell.recon.match.id\","
                 + "\"time\":\"2018-08-07T09:06:37Z\"}";
-        
+
         HistoryEntry historyEntry = HistoryEntry.load(project, fullJson);
         TestUtils.isSerializedTo(historyEntry, jsonSimple, false);
         TestUtils.isSerializedTo(historyEntry, fullJson, true);
     }
-    
+
     @Test
     public void deserializeUnknownOperation() throws IOException {
-    	// Unknown operations are serialized back as they were parsed
-    	HistoryEntry entry = HistoryEntry.load(project, unknownOperationJson);
-    	TestUtils.isSerializedTo(entry, unknownOperationJson, true);
+        // Unknown operations are serialized back as they were parsed
+        HistoryEntry entry = HistoryEntry.load(project, unknownOperationJson);
+        TestUtils.isSerializedTo(entry, unknownOperationJson, true);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryTests.java b/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryTests.java
index 10a91e6ba..779583079 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/history/HistoryTests.java
@@ -52,29 +52,29 @@ import com.google.refine.RefineTest;
 import com.google.refine.model.Project;
 import com.google.refine.util.TestUtils;
 
-
 public class HistoryTests extends RefineTest {
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //System Under Test
+    // System Under Test
     History SUT;
 
-    //dependencies
+    // dependencies
     Project proj;
     ProjectMetadata projectMetadata;
     ProjectManager projectManager;
     HistoryEntryManager historyEntryManager;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         projectManager = mock(ProjectManager.class);
         historyEntryManager = mock(HistoryEntryManager.class);
         ProjectManager.singleton = projectManager;
-        
+
         proj = new Project();
         projectMetadata = mock(ProjectMetadata.class);
 
@@ -86,14 +86,14 @@ public class HistoryTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown(){
+    public void TearDown() {
         SUT = null;
         proj = null;
     }
 
     @Test
-    public void canAddEntry(){
-        //local dependencies
+    public void canAddEntry() {
+        // local dependencies
         HistoryEntry entry = mock(HistoryEntry.class);
 
         SUT.addEntry(entry);
@@ -103,7 +103,7 @@ public class HistoryTests extends RefineTest {
         verify(projectMetadata, times(1)).updateModified();
         Assert.assertEquals(SUT.getLastPastEntries(1).get(0), entry);
     }
-    
+
     @Test
     public void serializeHistory() throws Exception {
         String json1 = "{\"id\":1533650900300,"
@@ -129,11 +129,11 @@ public class HistoryTests extends RefineTest {
         String json2 = "{\"id\":1533651586483,"
                 + "\"description\":\"Edit single cell on row 94, column organization_id\","
                 + "\"time\":\"2018-08-07T14:18:21Z\"}";
-        
-        String targetJson = "{\"past\":["+json1simple+","+json2+"],\"future\":[]}";
-        
+
+        String targetJson = "{\"past\":[" + json1simple + "," + json2 + "],\"future\":[]}";
+
         com.google.refine.history.Change dummyChange = mock(Change.class);
-        
+
         HistoryEntry firstEntry = HistoryEntry.load(proj, json1);
         firstEntry.setChange(dummyChange);
         HistoryEntry secondEntry = HistoryEntry.load(proj, json2);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java
index 705b20c8c..6d42fbdb0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java
@@ -33,7 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.importers;
 
-
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.assertTrue;
@@ -68,74 +67,75 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.google.refine.util.ParsingUtilities;
 
 public class ExcelImporterTests extends ImporterTest {
-    
+
     private static final double EPSILON = 0.0000001;
     private static final int SHEETS = 3;
     private static final int ROWS = 5;
     private static final int COLUMNS = 6;
-    
-    //private static final File xlsxFile = createSpreadsheet(true);
+
+    // private static final File xlsxFile = createSpreadsheet(true);
     private static final File xlsFile = createSpreadsheet(false);
     private static final File xlsxFile = createSpreadsheet(true);
 
     private static final File xlsFileWithMultiSheets = createSheetsWithDifferentColumns(false);
     private static final File xlsxFileWithMultiSheets = createSheetsWithDifferentColumns(true);
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //System Under Test
+    // System Under Test
     ExcelImporter SUT = null;
 
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
         SUT = new ExcelImporter();
     }
 
     @Override
     @AfterMethod
-    public void tearDown(){
+    public void tearDown() {
         SUT = null;
         super.tearDown();
     }
-    
-    //---------------------read tests------------------------
+
+    // ---------------------read tests------------------------
     @Test
-    public void readXls() throws FileNotFoundException, IOException{
+    public void readXls() throws FileNotFoundException, IOException {
 
         ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
         whenGetArrayOption("sheets", options, sheets);
-        
+
         whenGetIntegerOption("ignoreLines", options, 0);
         whenGetIntegerOption("headerLines", options, 0);
         whenGetIntegerOption("skipDataLines", options, 0);
         whenGetIntegerOption("limit", options, -1);
-        whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
 
         InputStream stream = new FileInputStream(xlsFile);
-        
+
         try {
             parseOneFile(SUT, stream);
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
-        
+
         Assert.assertEquals(project.rows.size(), ROWS);
         Assert.assertEquals(project.rows.get(1).cells.size(), COLUMNS);
-        Assert.assertEquals(((Number)project.rows.get(1).getCellValue(0)).doubleValue(),1.1, EPSILON);
-        Assert.assertEquals(((Number)project.rows.get(2).getCellValue(0)).doubleValue(),2.2, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(1).getCellValue(0)).doubleValue(), 1.1, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(2).getCellValue(0)).doubleValue(), 2.2, EPSILON);
 
-        Assert.assertFalse((Boolean)project.rows.get(1).getCellValue(1));
-        Assert.assertTrue((Boolean)project.rows.get(2).getCellValue(1));
-        
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(4)," Row 1 Col 5");
-        Assert.assertNull((String)project.rows.get(1).getCellValue(5));
+        Assert.assertFalse((Boolean) project.rows.get(1).getCellValue(1));
+        Assert.assertTrue((Boolean) project.rows.get(2).getCellValue(1));
+
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(4), " Row 1 Col 5");
+        Assert.assertNull((String) project.rows.get(1).getCellValue(5));
 
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(2))); // Calendar
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(3))); // Date
@@ -148,39 +148,40 @@ public class ExcelImporterTests extends ImporterTest {
     }
 
     @Test
-    public void readXlsx() throws FileNotFoundException, IOException{
+    public void readXlsx() throws FileNotFoundException, IOException {
 
         ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
         whenGetArrayOption("sheets", options, sheets);
-        
+
         whenGetIntegerOption("ignoreLines", options, 0);
         whenGetIntegerOption("headerLines", options, 0);
         whenGetIntegerOption("skipDataLines", options, 0);
         whenGetIntegerOption("limit", options, -1);
-        whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
-        
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
+
         InputStream stream = new FileInputStream(xlsxFile);
-        
+
         try {
             parseOneFile(SUT, stream);
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
-        
+
         Assert.assertEquals(project.rows.size(), ROWS);
         Assert.assertEquals(project.rows.get(1).cells.size(), COLUMNS);
-        Assert.assertEquals(((Number)project.rows.get(1).getCellValue(0)).doubleValue(),1.1, EPSILON);
-        Assert.assertEquals(((Number)project.rows.get(2).getCellValue(0)).doubleValue(),2.2, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(1).getCellValue(0)).doubleValue(), 1.1, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(2).getCellValue(0)).doubleValue(), 2.2, EPSILON);
 
-        Assert.assertFalse((Boolean)project.rows.get(1).getCellValue(1));
-        Assert.assertTrue((Boolean)project.rows.get(2).getCellValue(1));
+        Assert.assertFalse((Boolean) project.rows.get(1).getCellValue(1));
+        Assert.assertTrue((Boolean) project.rows.get(2).getCellValue(1));
 
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(2))); // Calendar
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(3))); // Date
 
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(4)," Row 1 Col 5");
-        Assert.assertNull((String)project.rows.get(1).getCellValue(5));
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(4), " Row 1 Col 5");
+        Assert.assertNull((String) project.rows.get(1).getCellValue(5));
 
         verify(options, times(1)).get("ignoreLines");
         verify(options, times(1)).get("headerLines");
@@ -190,7 +191,7 @@ public class ExcelImporterTests extends ImporterTest {
     }
 
     @Test
-    public void readExcel95() throws FileNotFoundException, IOException{
+    public void readExcel95() throws FileNotFoundException, IOException {
 
         InputStream stream = ClassLoader.getSystemResourceAsStream("excel95.xls");
 
@@ -201,11 +202,12 @@ public class ExcelImporterTests extends ImporterTest {
             Assert.fail(e.getMessage());
         }
     }
-    
+
     @Test
     public void readExcelDates() throws FileNotFoundException, IOException {
         ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
         whenGetArrayOption("sheets", options, sheets);
 
         whenGetIntegerOption("ignoreLines", options, 0);
@@ -217,7 +219,7 @@ public class ExcelImporterTests extends ImporterTest {
         InputStream stream = ClassLoader.getSystemResourceAsStream("dates.xls");
 
         parseOneFile(SUT, stream);
-        
+
         // The original value reads 2021-04-18 in the Excel file.
         // We make sure it is not shifted by a day because of timezone handling
         Object cellValue = project.rows.get(0).getCellValue(0);
@@ -236,19 +238,22 @@ public class ExcelImporterTests extends ImporterTest {
     }
 
     @Test
-    public void readMultiSheetXls() throws FileNotFoundException, IOException{
+    public void readMultiSheetXls() throws FileNotFoundException, IOException {
 
         ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 1\", fileNameAndSheetIndex: \"file-source#1\", rows: 31, selected: true}"));
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 2\", fileNameAndSheetIndex: \"file-source#2\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 1\", fileNameAndSheetIndex: \"file-source#1\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 2\", fileNameAndSheetIndex: \"file-source#2\", rows: 31, selected: true}"));
         whenGetArrayOption("sheets", options, sheets);
 
         whenGetIntegerOption("ignoreLines", options, 0);
         whenGetIntegerOption("headerLines", options, 0);
         whenGetIntegerOption("skipDataLines", options, 0);
         whenGetIntegerOption("limit", options, -1);
-        whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
 
         InputStream stream = new FileInputStream(xlsFileWithMultiSheets);
 
@@ -262,20 +267,20 @@ public class ExcelImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(1).cells.size(), COLUMNS);
         Assert.assertEquals(project.columnModel.columns.size(), COLUMNS + SHEETS - 1);
 
-        Assert.assertEquals(((Number)project.rows.get(1).getCellValue(0)).doubleValue(),1.1, EPSILON);
-        Assert.assertEquals(((Number)project.rows.get(2).getCellValue(0)).doubleValue(),2.2, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(1).getCellValue(0)).doubleValue(), 1.1, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(2).getCellValue(0)).doubleValue(), 2.2, EPSILON);
         // Check the value read from the second sheet.
-        Assert.assertEquals(((Number)project.rows.get(ROWS).getCellValue(0)).doubleValue(),0.0, EPSILON);
-        Assert.assertEquals(((Number)project.rows.get(ROWS).getCellValue(COLUMNS)).doubleValue(),1.0, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(ROWS).getCellValue(0)).doubleValue(), 0.0, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(ROWS).getCellValue(COLUMNS)).doubleValue(), 1.0, EPSILON);
 
-        Assert.assertFalse((Boolean)project.rows.get(1).getCellValue(1));
-        Assert.assertTrue((Boolean)project.rows.get(2).getCellValue(1));
+        Assert.assertFalse((Boolean) project.rows.get(1).getCellValue(1));
+        Assert.assertTrue((Boolean) project.rows.get(2).getCellValue(1));
 
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(2))); // Calendar
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(3))); // Date
 
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(4)," Row 1 Col 5");
-        Assert.assertNull((String)project.rows.get(1).getCellValue(5));
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(4), " Row 1 Col 5");
+        Assert.assertNull((String) project.rows.get(1).getCellValue(5));
 
         // We will read SHEETS sheets from created xls file.
         verify(options, times(SHEETS)).get("ignoreLines");
@@ -286,19 +291,22 @@ public class ExcelImporterTests extends ImporterTest {
     }
 
     @Test
-    public void readMultiSheetXlsx() throws FileNotFoundException, IOException{
+    public void readMultiSheetXlsx() throws FileNotFoundException, IOException {
 
         ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 1\", fileNameAndSheetIndex: \"file-source#1\", rows: 31, selected: true}"));
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 2\", fileNameAndSheetIndex: \"file-source#2\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 1\", fileNameAndSheetIndex: \"file-source#1\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 2\", fileNameAndSheetIndex: \"file-source#2\", rows: 31, selected: true}"));
         whenGetArrayOption("sheets", options, sheets);
 
         whenGetIntegerOption("ignoreLines", options, 0);
         whenGetIntegerOption("headerLines", options, 0);
         whenGetIntegerOption("skipDataLines", options, 0);
         whenGetIntegerOption("limit", options, -1);
-        whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
 
         InputStream stream = new FileInputStream(xlsxFileWithMultiSheets);
 
@@ -312,20 +320,20 @@ public class ExcelImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(1).cells.size(), COLUMNS);
         Assert.assertEquals(project.columnModel.columns.size(), COLUMNS + SHEETS - 1);
 
-        Assert.assertEquals(((Number)project.rows.get(1).getCellValue(0)).doubleValue(),1.1, EPSILON);
-        Assert.assertEquals(((Number)project.rows.get(2).getCellValue(0)).doubleValue(),2.2, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(1).getCellValue(0)).doubleValue(), 1.1, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(2).getCellValue(0)).doubleValue(), 2.2, EPSILON);
         // Check the value read from the second sheet.
-        Assert.assertEquals(((Number)project.rows.get(ROWS).getCellValue(0)).doubleValue(),0.0, EPSILON);
-        Assert.assertEquals(((Number)project.rows.get(ROWS).getCellValue(COLUMNS)).doubleValue(),1.0, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(ROWS).getCellValue(0)).doubleValue(), 0.0, EPSILON);
+        Assert.assertEquals(((Number) project.rows.get(ROWS).getCellValue(COLUMNS)).doubleValue(), 1.0, EPSILON);
 
-        Assert.assertFalse((Boolean)project.rows.get(1).getCellValue(1));
-        Assert.assertTrue((Boolean)project.rows.get(2).getCellValue(1));
+        Assert.assertFalse((Boolean) project.rows.get(1).getCellValue(1));
+        Assert.assertTrue((Boolean) project.rows.get(2).getCellValue(1));
 
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(2))); // Calendar
         assertTrue(ParsingUtilities.isDate(project.rows.get(1).getCellValue(3))); // Date
 
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(4)," Row 1 Col 5");
-        Assert.assertNull((String)project.rows.get(1).getCellValue(5));
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(4), " Row 1 Col 5");
+        Assert.assertNull((String) project.rows.get(1).getCellValue(5));
 
         // We will read SHEETS sheets from created xls file.
         verify(options, times(SHEETS)).get("ignoreLines");
@@ -365,7 +373,7 @@ public class ExcelImporterTests extends ImporterTest {
         return file;
     }
 
-   private static File createSheetsWithDifferentColumns(boolean xml) {
+    private static File createSheetsWithDifferentColumns(boolean xml) {
 
         final Workbook wb = xml ? new XSSFWorkbook() : new HSSFWorkbook();
 
@@ -395,41 +403,40 @@ public class ExcelImporterTests extends ImporterTest {
         return file;
     }
 
-private static void createDataRow(Sheet sheet, int row, CellStyle dateCellStyle, int extra_columns) {
-    int col = 0;
-    Row r = sheet.createRow(row);
-    Cell c;
+    private static void createDataRow(Sheet sheet, int row, CellStyle dateCellStyle, int extra_columns) {
+        int col = 0;
+        Row r = sheet.createRow(row);
+        Cell c;
 
+        c = r.createCell(col++);
+        c.setCellValue(row * 1.1); // double
 
-    c = r.createCell(col++);
-    c.setCellValue(row * 1.1); // double
+        c = r.createCell(col++);
+        c.setCellValue(row % 2 == 0); // boolean
 
-    c = r.createCell(col++);
-    c.setCellValue(row % 2 == 0); // boolean
+        c = r.createCell(col++);
+        c.setCellValue(Calendar.getInstance()); // calendar
+        c.setCellStyle(dateCellStyle);
 
-    c = r.createCell(col++);
-    c.setCellValue(Calendar.getInstance()); // calendar
-    c.setCellStyle(dateCellStyle);
+        c = r.createCell(col++);
+        c.setCellValue(new Date()); // date
+        c.setCellStyle(dateCellStyle);
 
-    c = r.createCell(col++);
-    c.setCellValue(new Date()); // date
-    c.setCellStyle(dateCellStyle);
+        c = r.createCell(col++);
+        c.setCellValue(" Row " + row + " Col " + col); // string
 
-    c = r.createCell(col++);
-    c.setCellValue(" Row " + row + " Col " + col); // string
-
-    c = r.createCell(col++);
-    c.setCellValue(""); // string
+        c = r.createCell(col++);
+        c.setCellValue(""); // string
 
 //    HSSFHyperlink hl = new HSSFHyperlink(HSSFHyperlink.LINK_URL);
 //    hl.setLabel(cellData.text);
 //    hl.setAddress(cellData.link);
 
-    // Create extra columns to ensure sheet(i+1) has more columns than sheet(i)
-    for(int i = 0; i < extra_columns; i++){
-        c = r.createCell(col++);
-        c.setCellValue(i + extra_columns);
+        // Create extra columns to ensure sheet(i+1) has more columns than sheet(i)
+        for (int i = 0; i < extra_columns; i++) {
+            c = r.createCell(col++);
+            c.setCellValue(i + extra_columns);
+        }
     }
-}
 
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.java
index 173937c16..996ba7ae0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/FixedWidthImporterTests.java
@@ -24,8 +24,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
-package com.google.refine.importers;
 
+package com.google.refine.importers;
 
 import java.io.StringReader;
 
@@ -41,37 +41,38 @@ import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 
 public class FixedWidthImporterTests extends ImporterTest {
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //constants
+    // constants
     String SAMPLE_ROW = "NDB_NoShrt_DescWater";
 
-    //System Under Test
+    // System Under Test
     FixedWidthImporter SUT = null;
 
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
         SUT = new FixedWidthImporter();
     }
 
     @Override
     @AfterMethod
-    public void tearDown(){
+    public void tearDown() {
         SUT = null;
         super.tearDown();
     }
-    
-    //---------------------read tests------------------------
+
+    // ---------------------read tests------------------------
     @Test
-    public void readFixedWidth(){
+    public void readFixedWidth() {
         StringReader reader = new StringReader(SAMPLE_ROW + "\nTooShort");
-        
+
         ArrayNode columnWidths = ParsingUtilities.mapper.createArrayNode();
         JSONUtilities.append(columnWidths, 6);
         JSONUtilities.append(columnWidths, 9);
@@ -80,7 +81,7 @@ public class FixedWidthImporterTests extends ImporterTest {
 
         ArrayNode columnNames = ParsingUtilities.mapper.createArrayNode();
         columnNames.add("Col 1");
-        columnNames.add("Col 2"); 
+        columnNames.add("Col 2");
         columnNames.add("Col 3");
         whenGetArrayOption("columnNames", options, columnNames);
 
@@ -88,22 +89,22 @@ public class FixedWidthImporterTests extends ImporterTest {
         whenGetIntegerOption("headerLines", options, 0);
         whenGetIntegerOption("skipDataLines", options, 0);
         whenGetIntegerOption("limit", options, -1);
-        whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
 
         try {
             parseOneFile(SUT, reader);
         } catch (Exception e) {
             Assert.fail(e.getMessage());
         }
-        
+
         Assert.assertEquals(project.rows.size(), 3); // Column names count as a row?
         Assert.assertEquals(project.rows.get(1).cells.size(), 3);
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(0), "NDB_No");
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(1), "Shrt_Desc");
-        Assert.assertEquals((String)project.rows.get(1).getCellValue(2), "Water");
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(0), "NDB_No");
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(1), "Shrt_Desc");
+        Assert.assertEquals((String) project.rows.get(1).getCellValue(2), "Water");
         Assert.assertEquals(project.rows.get(2).cells.size(), 3);
-        Assert.assertEquals((String)project.rows.get(2).getCellValue(0), "TooSho");
-        Assert.assertEquals((String)project.rows.get(2).getCellValue(1), "rt");
+        Assert.assertEquals((String) project.rows.get(2).getCellValue(0), "TooSho");
+        Assert.assertEquals((String) project.rows.get(2).getCellValue(1), "rt");
         Assert.assertNull(project.rows.get(2).getCellValue(2));
     }
 
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterTest.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterTest.java
index d76fc8946..33665e53b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.importers;
 
 import static org.mockito.Mockito.when;
@@ -52,15 +53,16 @@ import com.google.refine.model.Project;
 import com.google.refine.util.ParsingUtilities;
 
 public abstract class ImporterTest extends RefineTest {
-    //mock dependencies
+
+    // mock dependencies
     protected Project project;
     protected ProjectMetadata metadata;
     protected ImportingJob job;
     protected RefineServlet servlet;
     protected ObjectNode options;
 
-    public void setUp(){
-        //FIXME - should we try and use mock(Project.class); - seems unnecessary complexity
+    public void setUp() {
+        // FIXME - should we try and use mock(Project.class); - seems unnecessary complexity
 
         servlet = new RefineServletStub();
         ImportingManager.initialize(servlet);
@@ -69,48 +71,46 @@ public abstract class ImporterTest extends RefineTest {
         ImportingJob spiedJob = ImportingManager.createJob();
         job = Mockito.spy(spiedJob);
         when(job.getRetrievalRecord()).thenReturn(ParsingUtilities.mapper.createObjectNode());
-        
+
         options = Mockito.mock(ObjectNode.class);
     }
-    
-    public void tearDown(){
+
+    public void tearDown() {
         project = null;
         metadata = null;
-        
+
         ImportingManager.disposeJob(job.id);
         job = null;
-        
+
         options = null;
     }
-    
+
     protected void parseOneFile(ImportingParserBase parser, Reader reader) {
         List<Exception> exceptions = new ArrayList<Exception>();
         parser.parseOneFile(
-            project,
-            metadata,
-            job,
-            "file-source",
-            reader,
-            -1,
-            options,
-            exceptions
-        );
+                project,
+                metadata,
+                job,
+                "file-source",
+                reader,
+                -1,
+                options,
+                exceptions);
         assertEquals(exceptions.size(), 0);
         project.update();
     }
-    
+
     protected void parseOneFile(ImportingParserBase parser, InputStream inputStream) {
         List<Exception> exceptions = new ArrayList<Exception>();
         parser.parseOneFile(
-            project,
-            metadata,
-            job,
-            "file-source",
-            inputStream,
-            -1,
-            options,
-            exceptions
-        );
+                project,
+                metadata,
+                job,
+                "file-source",
+                inputStream,
+                -1,
+                options,
+                exceptions);
         assertEquals(exceptions.size(), 0);
         project.update();
     }
@@ -118,15 +118,14 @@ public abstract class ImporterTest extends RefineTest {
     protected List<Exception> parseOneFileAndReturnExceptions(ImportingParserBase parser, InputStream inputStream) {
         List<Exception> exceptions = new ArrayList<Exception>();
         parser.parseOneFile(
-            project,
-            metadata,
-            job,
-            "file-source",
-            inputStream,
-            -1,
-            options,
-            exceptions
-        );
+                project,
+                metadata,
+                job,
+                "file-source",
+                inputStream,
+                -1,
+                options,
+                exceptions);
         project.update();
         return exceptions;
     }
@@ -135,41 +134,39 @@ public abstract class ImporterTest extends RefineTest {
         ImportColumnGroup rootColumnGroup = new ImportColumnGroup();
         List<Exception> exceptions = new ArrayList<Exception>();
         parser.parseOneFile(
-            project,
-            metadata,
-            job,
-            "file-source",
-            reader,
-            rootColumnGroup,
-            -1,
-            options,
-            exceptions
-        );
+                project,
+                metadata,
+                job,
+                "file-source",
+                reader,
+                rootColumnGroup,
+                -1,
+                options,
+                exceptions);
         assertEquals(exceptions.size(), 0);
         XmlImportUtilities.createColumnsFromImport(project, rootColumnGroup);
         project.columnModel.update();
     }
-    
+
     protected void parseOneFile(TreeImportingParserBase parser, InputStream inputStream, ObjectNode options) {
         parseOneInputStreamAsReader(parser, inputStream, options);
     }
-    
+
     protected void parseOneInputStream(
             TreeImportingParserBase parser, InputStream inputStream, ObjectNode options) {
         ImportColumnGroup rootColumnGroup = new ImportColumnGroup();
         List<Exception> exceptions = new ArrayList<Exception>();
-        
+
         parser.parseOneFile(
-            project,
-            metadata,
-            job,
-            "file-source",
-            inputStream,
-            rootColumnGroup,
-            -1,
-            options,
-            exceptions
-        );
+                project,
+                metadata,
+                job,
+                "file-source",
+                inputStream,
+                rootColumnGroup,
+                -1,
+                options,
+                exceptions);
         postProcessProject(project, rootColumnGroup, exceptions);
     }
 
@@ -177,34 +174,33 @@ public abstract class ImporterTest extends RefineTest {
             TreeImportingParserBase parser, InputStream inputStream, ObjectNode options) {
         ImportColumnGroup rootColumnGroup = new ImportColumnGroup();
         List<Exception> exceptions = new ArrayList<Exception>();
-        
+
         Reader reader = new InputStreamReader(inputStream);
         parser.parseOneFile(
-            project,
-            metadata,
-            job,
-            "file-source",
-            reader,
-            rootColumnGroup,
-            -1,
-            options,
-            exceptions
-        );
+                project,
+                metadata,
+                job,
+                "file-source",
+                reader,
+                rootColumnGroup,
+                -1,
+                options,
+                exceptions);
         postProcessProject(project, rootColumnGroup, exceptions);
-        
+
         try {
             reader.close();
         } catch (IOException e) {
-            //ignore errors on close
+            // ignore errors on close
         }
     }
-    
+
     protected void postProcessProject(
-        Project project, ImportColumnGroup rootColumnGroup, List<Exception> exceptions) {
-        
+            Project project, ImportColumnGroup rootColumnGroup, List<Exception> exceptions) {
+
         XmlImportUtilities.createColumnsFromImport(project, rootColumnGroup);
         project.update();
-        
+
         for (Exception e : exceptions) {
             e.printStackTrace();
         }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java
index 01ae486cf..b17d9be6f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java
@@ -54,22 +54,22 @@ import com.google.refine.model.Row;
 import com.google.refine.model.Column;
 
 public class ImporterUtilitiesTests extends RefineTest {
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    @Test(enabled=false)
-    public void parseCellValueWithText(){
+    @Test(enabled = false)
+    public void parseCellValueWithText() {
         String END_QUOTES_SHOULD_BE_RETAINED = "\"To be\" is almost always followed by \"or not to be\"";
         String response = (String) ImporterUtilities.parseCellValue(END_QUOTES_SHOULD_BE_RETAINED);
         Assert.assertEquals(response, END_QUOTES_SHOULD_BE_RETAINED);
     }
 
     @Test
-    public void getIntegerOption(){
+    public void getIntegerOption() {
         Properties options = mock(Properties.class);
         when(options.containsKey("testInteger")).thenReturn(true);
         when(options.getProperty("testInteger")).thenReturn("5");
@@ -80,7 +80,7 @@ public class ImporterUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void getIntegerOptionReturnsDefaultOnError(){
+    public void getIntegerOptionReturnsDefaultOnError() {
         Properties options = mock(Properties.class);
         when(options.containsKey("testInteger")).thenReturn(true);
         when(options.getProperty("testInteger")).thenReturn("notAnInteger");
@@ -91,10 +91,9 @@ public class ImporterUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void appendColumnName(){
+    public void appendColumnName() {
         List<String> columnNames = new ArrayList<String>();
 
-
         ImporterUtilities.appendColumnName(columnNames, 0, "foo");
         ImporterUtilities.appendColumnName(columnNames, 1, "bar");
         Assert.assertEquals(columnNames.size(), 2);
@@ -103,7 +102,7 @@ public class ImporterUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void appendColumnNameFromMultipleRows(){
+    public void appendColumnNameFromMultipleRows() {
         List<String> columnNames = new ArrayList<String>();
 
         ImporterUtilities.appendColumnName(columnNames, 0, "foo");
@@ -113,7 +112,7 @@ public class ImporterUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void ensureColumnsInRowExist(){
+    public void ensureColumnsInRowExist() {
         String VALUE_1 = "value1";
         String VALUE_2 = "value2";
         Row row = new Row(2);
@@ -129,15 +128,14 @@ public class ImporterUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void ensureColumnsInRowExistDoesExpand(){
+    public void ensureColumnsInRowExistDoesExpand() {
         Row row = new Row(4);
-        for(int i = 1; i < 5; i++) {
+        for (int i = 1; i < 5; i++) {
             row.cells.add(new Cell("value" + i, null));
         }
 
         ArrayList<String> columnNames = new ArrayList<String>(2);
 
-
         ImporterUtilities.ensureColumnsInRowExist(columnNames, row);
 
         Assert.assertEquals(row.cells.size(), 4);
@@ -145,20 +143,20 @@ public class ImporterUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void setupColumns(){
+    public void setupColumns() {
         Project project = new Project();
         List<String> columnNames = new ArrayList<String>();
         columnNames.add("col1");
         columnNames.add("col2");
         columnNames.add("");
         ImporterUtilities.setupColumns(project, columnNames);
-        Assert.assertEquals( project.columnModel.columns.get(0).getName(), "col1" );
-        Assert.assertEquals( project.columnModel.columns.get(1).getName(), "col2" );
-        Assert.assertEquals( project.columnModel.columns.get(2).getName(), "Column");
+        Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
+        Assert.assertEquals(project.columnModel.columns.get(1).getName(), "col2");
+        Assert.assertEquals(project.columnModel.columns.get(2).getName(), "Column");
     }
 
     @Test
-    public void testGetOrAllocateColumn(){
+    public void testGetOrAllocateColumn() {
         Project project = new Project();
         List<String> columnNames = new ArrayList<String>();
         columnNames.add("Column 1");
@@ -166,9 +164,9 @@ public class ImporterUtilitiesTests extends RefineTest {
         columnNames.add("Column 3");
         // Set up column names in project
         ImporterUtilities.setupColumns(project, columnNames);
-        Assert.assertEquals( project.columnModel.columns.get(0).getName(), "Column 1" );
-        Assert.assertEquals( project.columnModel.columns.get(1).getName(), "Column 2" );
-        Assert.assertEquals( project.columnModel.columns.get(2).getName(), "Column 3");
+        Assert.assertEquals(project.columnModel.columns.get(0).getName(), "Column 1");
+        Assert.assertEquals(project.columnModel.columns.get(1).getName(), "Column 2");
+        Assert.assertEquals(project.columnModel.columns.get(2).getName(), "Column 3");
 
         // This will mock the situation of importing another sheet from the same file.
         // Expect newColumnNames can be updated using column names.
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java
index 943d0af5f..d2fdc7da4 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java
@@ -61,17 +61,17 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.importers.tree.ImportColumnGroup;
 
 public class JsonImporterTests extends ImporterTest {
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-
-    //dependencies
+    // dependencies
     ByteArrayInputStream inputStream = null;
 
-    //System Under Test
+    // System Under Test
     JsonImporter SUT = null;
 
     @BeforeMethod
@@ -136,8 +136,7 @@ public class JsonImporterTests extends ImporterTest {
                 rootColumnGroup,
                 -1,
                 options,
-                exceptions
-        );
+                exceptions);
         Assert.assertFalse(exceptions.isEmpty());
         Assert.assertEquals("Unexpected character (';' (code 59)): was expecting comma to separate Object entries",
                 exceptions.get(0).getMessage());
@@ -145,15 +144,14 @@ public class JsonImporterTests extends ImporterTest {
 
     @Test
     public void trimLeadingTrailingWhitespaceOnTrimStrings() {
-        String ScraperwikiOutput =
-                "[\n" +
-                        "{\n" +
-                        "        \"school\": \"  University of Cambridge  \",\n" +
-                        "        \"name\": \"          Amy Zhang                   \",\n" +
-                        "        \"student-faculty-score\": \"100\",\n" +
-                        "        \"intl-student-score\": \"95\"\n" +
-                        "    }\n" +
-                        "]\n";
+        String ScraperwikiOutput = "[\n" +
+                "{\n" +
+                "        \"school\": \"  University of Cambridge  \",\n" +
+                "        \"name\": \"          Amy Zhang                   \",\n" +
+                "        \"student-faculty-score\": \"100\",\n" +
+                "        \"intl-student-score\": \"95\"\n" +
+                "    }\n" +
+                "]\n";
         RunTest(ScraperwikiOutput, true);
         assertProjectCreated(project, 4, 1);
         Row row = project.rows.get(0);
@@ -165,15 +163,14 @@ public class JsonImporterTests extends ImporterTest {
 
     @Test
     public void doesNotTrimLeadingTrailingWhitespaceOnNoTrimStrings() {
-        String ScraperwikiOutput =
-                "[\n" +
-                        "{\n" +
-                        "        \"school\": \"  University of Cambridge  \",\n" +
-                        "        \"name\": \"          Amy Zhang                   \",\n" +
-                        "        \"student-faculty-score\": \"100\",\n" +
-                        "        \"intl-student-score\": \"95\"\n" +
-                        "    }\n" +
-                        "]\n";
+        String ScraperwikiOutput = "[\n" +
+                "{\n" +
+                "        \"school\": \"  University of Cambridge  \",\n" +
+                "        \"name\": \"          Amy Zhang                   \",\n" +
+                "        \"student-faculty-score\": \"100\",\n" +
+                "        \"intl-student-score\": \"95\"\n" +
+                "    }\n" +
+                "]\n";
         RunTest(ScraperwikiOutput);
         assertProjectCreated(project, 4, 1);
         Row row = project.rows.get(0);
@@ -255,40 +252,39 @@ public class JsonImporterTests extends ImporterTest {
 
     @Test
     public void testJSONMinimumArray() {
-        String ScraperwikiOutput =
-                "[\n" +
-                        "{\n" +
-                        "        \"school\": \"University of Cambridge\\n" +
-                        "                            United Kingdom\",\n" +
-                        "        \"student-faculty-score\": \"100\",\n" +
-                        "        \"intl-student-score\": \"95\",\n" +
-                        "        \"intl-faculty-score\": \"96\",\n" +
-                        "        \"rank\": \"#1\",\n" +
-                        "        \"peer-review-score\": \"100\",\n" +
-                        "        \"emp-review-score\": \"100\",\n" +
-                        "        \"score\": \"100.0\",\n" +
-                        "        \"citations-score\": \"93\"\n" +
-                        "    },\n" +
-                        "    {\n" +
-                        "        \"school\": \"Harvard University\\n" +
-                        "                            United States\",\n" +
-                        "        \"student-faculty-score\": \"97\",\n" +
-                        "        \"intl-student-score\": \"87\",\n" +
-                        "        \"intl-faculty-score\": \"71\",\n" +
-                        "        \"rank\": \"#2\",\n" +
-                        "        \"peer-review-score\": \"100\",\n" +
-                        "        \"emp-review-score\": \"100\",\n" +
-                        "        \"score\": \"99.2\",\n" +
-                        "        \"citations-score\": \"100\"\n" +
-                        "    }\n" +
-                        "]\n";
+        String ScraperwikiOutput = "[\n" +
+                "{\n" +
+                "        \"school\": \"University of Cambridge\\n" +
+                "                            United Kingdom\",\n" +
+                "        \"student-faculty-score\": \"100\",\n" +
+                "        \"intl-student-score\": \"95\",\n" +
+                "        \"intl-faculty-score\": \"96\",\n" +
+                "        \"rank\": \"#1\",\n" +
+                "        \"peer-review-score\": \"100\",\n" +
+                "        \"emp-review-score\": \"100\",\n" +
+                "        \"score\": \"100.0\",\n" +
+                "        \"citations-score\": \"93\"\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"school\": \"Harvard University\\n" +
+                "                            United States\",\n" +
+                "        \"student-faculty-score\": \"97\",\n" +
+                "        \"intl-student-score\": \"87\",\n" +
+                "        \"intl-faculty-score\": \"71\",\n" +
+                "        \"rank\": \"#2\",\n" +
+                "        \"peer-review-score\": \"100\",\n" +
+                "        \"emp-review-score\": \"100\",\n" +
+                "        \"score\": \"99.2\",\n" +
+                "        \"citations-score\": \"100\"\n" +
+                "    }\n" +
+                "]\n";
         RunTest(ScraperwikiOutput);
         assertProjectCreated(project, 9, 2);
     }
 
     /**
-     * org.codehaus.Jackson.JsonParser has an inconsistency when returning getLocalName
-     * of an Entity_Start token which occurs after a Field_Name token
+     * org.codehaus.Jackson.JsonParser has an inconsistency when returning getLocalName of an Entity_Start token which
+     * occurs after a Field_Name token
      */
     @Test
     public void EnsureJSONParserHandlesgetLocalNameCorrectly() throws Exception {
@@ -312,10 +308,9 @@ public class JsonImporterTests extends ImporterTest {
                 }
             }
         } catch (Exception e) {
-            //silent
+            // silent
         }
 
-
         parser = new JSONTreeReader(new ByteArrayInputStream(sampleJson2.getBytes("UTF-8")));
         token = Token.Ignorable;
         i = 0;
@@ -332,7 +327,7 @@ public class JsonImporterTests extends ImporterTest {
                 }
             }
         } catch (Exception e) {
-            //silent
+            // silent
         }
 
         parser = new JSONTreeReader(new ByteArrayInputStream(sampleJson3.getBytes("UTF-8")));
@@ -359,7 +354,7 @@ public class JsonImporterTests extends ImporterTest {
                 }
             }
         } catch (Exception e) {
-            //silent
+            // silent
         }
     }
 
@@ -389,7 +384,6 @@ public class JsonImporterTests extends ImporterTest {
         }
     }
 
-
     @Test
     public void testJsonDatatypes() {
         RunTest(getSampleWithDataTypes());
@@ -453,11 +447,9 @@ public class JsonImporterTests extends ImporterTest {
 
         // null, true, false 0,1,-2.1,0.23,-0.24,3.14e100
 
-
         // TODO: check data types
     }
 
-
     @Test
     public void testComplexJsonStructure() throws IOException {
         String fileName = "grid_small.json";
@@ -477,7 +469,8 @@ public class JsonImporterTests extends ImporterTest {
         // File is assumed to be in job.getRawDataDir(), so copy it there
         FileUtils.copyFile(new File(filename), new File(job.getRawDataDir(), FILE));
         List<ObjectNode> fileRecords = new ArrayList<>();
-        fileRecords.add(ParsingUtilities.evaluateJsonStringToObjectNode(String.format("{\"location\": \"%s\",\"fileName\": \"%s\"}", FILE, "json-sample-format-1.json")));
+        fileRecords.add(ParsingUtilities.evaluateJsonStringToObjectNode(
+                String.format("{\"location\": \"%s\",\"fileName\": \"%s\"}", FILE, "json-sample-format-1.json")));
 
         ObjectNode options = SUT.createParserUIInitializationData(
                 job, new LinkedList<>(), "text/json");
@@ -487,7 +480,7 @@ public class JsonImporterTests extends ImporterTest {
         JSONUtilities.safePut(options, "trimStrings", false);
         JSONUtilities.safePut(options, "storeEmptyStrings", true);
         JSONUtilities.safePut(options, "guessCellValueTypes", false);
-        JSONUtilities.safePut(options,"includeFileSources",true);
+        JSONUtilities.safePut(options, "includeFileSources", true);
 
         List<Exception> exceptions = new ArrayList<Exception>();
 
@@ -499,13 +492,12 @@ public class JsonImporterTests extends ImporterTest {
                 "text/json",
                 -1,
                 options,
-                exceptions
-        );
+                exceptions);
         Assert.assertNotNull(project.columnModel.getColumnByName("File"));
-        Assert.assertEquals(project.rows.get(0).getCell(0).value,"json-sample-format-1.json");
+        Assert.assertEquals(project.rows.get(0).getCell(0).value, "json-sample-format-1.json");
     }
 
-    //------------helper methods---------------
+    // ------------helper methods---------------
 
     private static String getTypicalElement(int id) {
         return "{ \"id\" : " + id + "," +
@@ -576,7 +568,7 @@ public class JsonImporterTests extends ImporterTest {
             sb.append(",");
         }
         sb.append("{\"id\" : 4," +
-                "\"author\" : \"With line\\n break\"," + //FIXME this line break is doubled - is this correct??
+                "\"author\" : \"With line\\n break\"," + // FIXME this line break is doubled - is this correct??
                 "\"title\" : \"Book title 4\"," +
                 "\"publish_date\" : \"2010-05-26\"" +
                 "},");
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/MarcImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/MarcImporterTests.java
index 0da847e8d..0ab5a32e1 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/MarcImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/MarcImporterTests.java
@@ -81,7 +81,6 @@ public class MarcImporterTests extends XmlImporterTests {
         super.tearDown();
     }
 
-    
     @Test
     public void readMarcFileWithUnicode() throws FileNotFoundException, IOException {
         final String FILE = "scriblio.mrc";
@@ -94,7 +93,7 @@ public class MarcImporterTests extends XmlImporterTests {
         // NOTE: This has the side effect of creating scriblio.mrc.xml
         ObjectNode options = SUT.createParserUIInitializationData(
                 job, fileRecords, "binary/marc");
-        
+
         ArrayNode path = ParsingUtilities.mapper.createArrayNode();
         JSONUtilities.append(path, "marc:collection");
         JSONUtilities.append(path, "marc:record");
@@ -116,8 +115,7 @@ public class MarcImporterTests extends XmlImporterTests {
         Row r2 = project.rows.get(2);
         assertEquals(r2.getCellValue(1), "005");
         assertEquals(r2.getCellValue(5), "£4.99");
-        assertEquals(project.rows.get(29).getCellValue(3),"700");
+        assertEquals(project.rows.get(29).getCellValue(3), "700");
     }
 
-
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/OdsImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/OdsImporterTests.java
index ff5b7e42e..ca087c237 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/OdsImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/OdsImporterTests.java
@@ -68,35 +68,36 @@ public class OdsImporterTests extends ImporterTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //System Under Test
+    // System Under Test
     OdsImporter SUT = null;
 
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
         SUT = new OdsImporter();
     }
 
     @Override
     @AfterMethod
-    public void tearDown(){
+    public void tearDown() {
         SUT = null;
         super.tearDown();
     }
 
     @Test
-    public void readOds() throws FileNotFoundException, IOException{
+    public void readOds() throws FileNotFoundException, IOException {
 
         ArrayNode sheets = ParsingUtilities.mapper.createArrayNode();
-        sheets.add(ParsingUtilities.mapper.readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
+        sheets.add(ParsingUtilities.mapper
+                .readTree("{name: \"file-source#Test Sheet 0\", fileNameAndSheetIndex: \"file-source#0\", rows: 31, selected: true}"));
         whenGetArrayOption("sheets", options, sheets);
 
         whenGetIntegerOption("ignoreLines", options, 0);
         whenGetIntegerOption("headerLines", options, 1);
         whenGetIntegerOption("skipDataLines", options, 0);
         whenGetIntegerOption("limit", options, ROWS);
-        whenGetBooleanOption("storeBlankCellsAsNulls",options,true);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
 
         InputStream stream = ClassLoader.getSystemResourceAsStream("films.ods");
 
@@ -109,14 +110,14 @@ public class OdsImporterTests extends ImporterTest {
         assertEquals(project.rows.size(), ROWS);
         Row row = project.rows.get(0);
         assertEquals(row.cells.size(), COLUMNS);
-        assertEquals((String)row.getCellValue(1),"2 Days In New York");
-        assertEquals(((OffsetDateTime)row.getCellValue(3)).toString().substring(0, 10),"2012-03-28");
-        assertEquals(((Number)row.getCellValue(5)).doubleValue(), 4.5, EPSILON);
+        assertEquals((String) row.getCellValue(1), "2 Days In New York");
+        assertEquals(((OffsetDateTime) row.getCellValue(3)).toString().substring(0, 10), "2012-03-28");
+        assertEquals(((Number) row.getCellValue(5)).doubleValue(), 4.5, EPSILON);
 
-        assertFalse((Boolean)row.getCellValue(7));
-        assertTrue((Boolean)project.rows.get(1).getCellValue(7));
+        assertFalse((Boolean) row.getCellValue(7));
+        assertTrue((Boolean) project.rows.get(1).getCellValue(7));
 
-        assertNull((String)project.rows.get(2).getCellValue(2));
+        assertNull((String) project.rows.get(2).getCellValue(2));
 
         verify(options, times(1)).get("ignoreLines");
         verify(options, times(1)).get("headerLines");
@@ -125,5 +126,4 @@ public class OdsImporterTests extends ImporterTest {
         verify(options, times(1)).get("storeBlankCellsAsNulls");
     }
 
-
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java
index 4682cbf72..05d99253f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/RdfTripleImporterTests.java
@@ -47,27 +47,26 @@ import org.testng.annotations.Test;
 import com.google.refine.util.JSONUtilities;
 
 public class RdfTripleImporterTests extends ImporterTest {
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
-    
-    //System Under Test
+
+    // System Under Test
     RdfTripleImporter SUT = null;
 
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
         SUT = new RdfTripleImporter();
         JSONUtilities.safePut(options, "base-url", "http://rdf.freebase.com");
     }
 
-    @Test(enabled=false)
-    public void canParseSingleLineTriple(){
+    @Test(enabled = false)
+    public void canParseSingleLineTriple() {
         String sampleRdf = "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.blood_on_the_tracks>.";
         StringReader reader = new StringReader(sampleRdf);
 
@@ -88,33 +87,35 @@ public class RdfTripleImporterTests extends ImporterTest {
 
     @Test
     public void canParseMultiLineTriple() throws UnsupportedEncodingException {
-        String sampleRdf = "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.blood_on_the_tracks>.\n" +
-            "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.under_the_red_sky>.\n" +
-            "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.bringing_it_all_back_home>.";
+        String sampleRdf = "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.blood_on_the_tracks>.\n"
+                +
+                "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.under_the_red_sky>.\n"
+                +
+                "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.bringing_it_all_back_home>.";
         InputStream input = new ByteArrayInputStream(sampleRdf.getBytes("UTF-8"));
         parseOneFile(SUT, input);
 
-        //columns
+        // columns
         Assert.assertEquals(project.columnModel.columns.size(), 2);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "subject");
         Assert.assertEquals(project.columnModel.columns.get(1).getName(), "http://rdf.freebase.com/ns/music.artist.album");
 
-        //rows
+        // rows
         Assert.assertEquals(project.rows.size(), 3);
-        
-        //row0
+
+        // row0
         Assert.assertEquals(project.rows.get(0).cells.size(), 2);
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "http://rdf.freebase.com/ns/en.bob_dylan");
-        Assert.assertEquals(project.rows.get(0).cells.get(1).value, "http://rdf.freebase.com/ns/en.bringing_it_all_back_home"); 
+        Assert.assertEquals(project.rows.get(0).cells.get(1).value, "http://rdf.freebase.com/ns/en.bringing_it_all_back_home");
 
-        //row1
+        // row1
         Assert.assertEquals(project.rows.get(1).cells.size(), 2);
         Assert.assertNull(project.rows.get(1).cells.get(0));
         Assert.assertEquals(project.rows.get(1).cells.get(1).value, "http://rdf.freebase.com/ns/en.under_the_red_sky");
         Assert.assertEquals(project.recordModel.getRowDependency(1).cellDependencies[1].rowIndex, 0);
         Assert.assertEquals(project.recordModel.getRowDependency(1).cellDependencies[1].cellIndex, 0);
 
-        //row2
+        // row2
         Assert.assertEquals(project.rows.get(2).cells.size(), 2);
         Assert.assertNull(project.rows.get(2).cells.get(0));
         Assert.assertEquals(project.rows.get(2).cells.get(1).value, "http://rdf.freebase.com/ns/en.blood_on_the_tracks");
@@ -124,40 +125,42 @@ public class RdfTripleImporterTests extends ImporterTest {
 
     @Test
     public void canParseMultiLineMultiPredicatesTriple() throws UnsupportedEncodingException {
-        String sampleRdf = "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.blood_on_the_tracks>.\n" +
-            "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.genre> <http://rdf.freebase.com/ns/en.folk_rock>.\n" +
-            "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.bringing_it_all_back_home>.";
+        String sampleRdf = "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.blood_on_the_tracks>.\n"
+                +
+                "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.genre> <http://rdf.freebase.com/ns/en.folk_rock>.\n"
+                +
+                "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/music.artist.album> <http://rdf.freebase.com/ns/en.bringing_it_all_back_home>.";
         InputStream input = new ByteArrayInputStream(sampleRdf.getBytes("UTF-8"));
         parseOneFile(SUT, input);
- 
-        //columns
+
+        // columns
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "subject");
         Assert.assertEquals(project.columnModel.columns.get(1).getName(), "http://rdf.freebase.com/ns/music.artist.album");
         Assert.assertEquals(project.columnModel.columns.get(2).getName(), "http://rdf.freebase.com/ns/music.artist.genre");
-        
-        //rows
+
+        // rows
         Assert.assertEquals(project.rows.size(), 2);
 
-        //row0
+        // row0
         Assert.assertEquals(project.rows.get(0).cells.size(), 3);
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "http://rdf.freebase.com/ns/en.bob_dylan");
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "http://rdf.freebase.com/ns/en.bringing_it_all_back_home");
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "http://rdf.freebase.com/ns/en.folk_rock");
 
-        //row1
+        // row1
         Assert.assertEquals(project.rows.get(1).cells.size(), 2);
         Assert.assertNull(project.rows.get(1).cells.get(0));
         Assert.assertEquals(project.rows.get(1).cells.get(1).value, "http://rdf.freebase.com/ns/en.blood_on_the_tracks");
         Assert.assertEquals(project.recordModel.getRowDependency(1).cellDependencies[1].rowIndex, 0);
         Assert.assertEquals(project.recordModel.getRowDependency(1).cellDependencies[1].cellIndex, 0);
     }
-    
+
     @Test
     public void canParseTripleWithValue() throws UnsupportedEncodingException {
         String sampleRdf = "<http://rdf.freebase.com/ns/en.bob_dylan> <http://rdf.freebase.com/ns/common.topic.alias>\"Robert Zimmerman\"@en.";
         InputStream input = new ByteArrayInputStream(sampleRdf.getBytes("UTF-8"));
-        
+
         SUT = new RdfTripleImporter(RdfTripleImporter.Mode.N3);
         parseOneFile(SUT, input);
 
@@ -168,8 +171,8 @@ public class RdfTripleImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.size(), 2);
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "http://rdf.freebase.com/ns/en.bob_dylan");
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "Robert Zimmerman@en");
-    }    
-    
+    }
+
     @Test
     public void canParseRdfXml() throws UnsupportedEncodingException {
         // From W3C spec http://www.w3.org/TR/REC-rdf-syntax/#example8
@@ -206,18 +209,18 @@ public class RdfTripleImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(3).cells.get(1).value, "The Tree@en");
         Assert.assertEquals(project.rows.get(3).cells.get(2).value, "Das Buch ist außergewöhnlich@de");
     }
-    
+
     @Test
     public void canParseN3() throws UnsupportedEncodingException {
-        String sampleRdf = "@prefix p:  <http://www.example.org/personal_details#> .\n" + 
-            "@prefix m:  <http://www.example.org/meeting_organization#> .\n\n" + 
-            "<http://www.example.org/people#fred>\n" + 
-                    "p:GivenName     \"Fred\";\n" + 
-                    "p:hasEmail              <mailto:fred@example.com>;\n" + 
-                    "m:attending     <http://meetings.example.com/cal#m1> .\n";
-                        
+        String sampleRdf = "@prefix p:  <http://www.example.org/personal_details#> .\n" +
+                "@prefix m:  <http://www.example.org/meeting_organization#> .\n\n" +
+                "<http://www.example.org/people#fred>\n" +
+                "p:GivenName     \"Fred\";\n" +
+                "p:hasEmail              <mailto:fred@example.com>;\n" +
+                "m:attending     <http://meetings.example.com/cal#m1> .\n";
+
         InputStream input = new ByteArrayInputStream(sampleRdf.getBytes("UTF-8"));
-        
+
         SUT = new RdfTripleImporter(RdfTripleImporter.Mode.N3);
         parseOneFile(SUT, input);
 
@@ -233,18 +236,18 @@ public class RdfTripleImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "mailto:fred@example.com");
         Assert.assertEquals(project.rows.get(0).cells.get(3).value, "Fred");
     }
-    
+
     @Test
     public void canParseTtl() throws UnsupportedEncodingException {
-        String sampleRdf = "@prefix p:  <http://www.example.org/personal_details#> .\n" + 
-            "@prefix m:  <http://www.example.org/meeting_organization#> .\n\n" + 
-            "<http://www.example.org/people#fred>\n" + 
-                    "p:GivenName     \"Fred\";\n" + 
-                    "p:hasEmail              <mailto:fred@example.com>;\n" + 
-                    "m:attending     <http://meetings.example.com/cal#m1> .\n";
-                        
+        String sampleRdf = "@prefix p:  <http://www.example.org/personal_details#> .\n" +
+                "@prefix m:  <http://www.example.org/meeting_organization#> .\n\n" +
+                "<http://www.example.org/people#fred>\n" +
+                "p:GivenName     \"Fred\";\n" +
+                "p:hasEmail              <mailto:fred@example.com>;\n" +
+                "m:attending     <http://meetings.example.com/cal#m1> .\n";
+
         InputStream input = new ByteArrayInputStream(sampleRdf.getBytes("UTF-8"));
-        
+
         SUT = new RdfTripleImporter(RdfTripleImporter.Mode.TTL);
         parseOneFile(SUT, input);
 
@@ -260,15 +263,16 @@ public class RdfTripleImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "mailto:fred@example.com");
         Assert.assertEquals(project.rows.get(0).cells.get(3).value, "Fred");
     }
-    
+
     @Test
     public void canParseNTriples() throws UnsupportedEncodingException {
-        String sampleRdf = "<http://www.example.org/people#fred> <http://www.example.org/meeting_organization#attending> <http://meetings.example.com/cal#m1> . \n" +
-                           "<http://www.example.org/people#fred> <http://www.example.org/personal_details#hasEmail> <mailto:fred@example.com> . \n" +
-                           "<http://www.example.org/people#fred> <http://www.example.org/personal_details#GivenName> \"Fred\" . ";
-                        
+        String sampleRdf = "<http://www.example.org/people#fred> <http://www.example.org/meeting_organization#attending> <http://meetings.example.com/cal#m1> . \n"
+                +
+                "<http://www.example.org/people#fred> <http://www.example.org/personal_details#hasEmail> <mailto:fred@example.com> . \n" +
+                "<http://www.example.org/people#fred> <http://www.example.org/personal_details#GivenName> \"Fred\" . ";
+
         InputStream input = new ByteArrayInputStream(sampleRdf.getBytes("UTF-8"));
-        
+
         SUT = new RdfTripleImporter(RdfTripleImporter.Mode.NT);
         parseOneFile(SUT, input);
 
@@ -277,7 +281,7 @@ public class RdfTripleImporterTests extends ImporterTest {
         Assert.assertEquals(project.columnModel.columns.get(1).getName(), "http://www.example.org/personal_details#GivenName");
         Assert.assertEquals(project.columnModel.columns.get(2).getName(), "http://www.example.org/personal_details#hasEmail");
         Assert.assertEquals(project.columnModel.columns.get(3).getName(), "http://www.example.org/meeting_organization#attending");
-        
+
         Assert.assertEquals(project.rows.size(), 1);
         Assert.assertEquals(project.rows.get(0).cells.size(), 4);
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "http://www.example.org/people#fred");
@@ -298,12 +302,12 @@ public class RdfTripleImporterTests extends ImporterTest {
         SUT = new RdfTripleImporter(RdfTripleImporter.Mode.TTL);
         parseOneFile(SUT, input);
 
-        String[] columns = {"subject",
+        String[] columns = { "subject",
                 "http://example.org/data#professor",
                 "http://example.org/data#title",
                 "http://example.org/data#homePage",
                 "http://example.org/data#fullName",
-                };
+        };
 
         Assert.assertEquals(project.columnModel.columns.size(), columns.length);
         for (int i = 0; i < columns.length; i++) {
@@ -320,26 +324,26 @@ public class RdfTripleImporterTests extends ImporterTest {
 
     @Test
     public void canParseJsonld() throws UnsupportedEncodingException {
-        String sampleJsonld = "{\n "+
-        "  \"@context\": {\n "+
-        "    \"m\": \"http://www.example.org/meeting_organization#\",\n "+
-        "    \"p\": \"http://www.example.org/personal_details#\",\n "+
-        "    \"rdf\": \"http://www.w3.org/1999/02/22-rdf-syntax-ns#\",\n "+
-        "    \"rdfs\": \"http://www.w3.org/2000/01/rdf-schema#\",\n "+
-        "    \"xsd\": \"http://www.w3.org/2001/XMLSchema#\"\n "+
-        "  },\n "+
-        "  \"@id\": \"http://www.example.org/people#fred\",\n "+
-        "  \"m:attending\": {\n "+
-        "    \"@id\": \"http://meetings.example.com/cal#m1\"\n "+
-        "  },\n "+
-        "  \"p:GivenName\": \"Fred\",\n "+
-        "  \"p:hasEmail\": {\n "+
-        "    \"@id\": \"mailto:fred@example.com\"\n "+
-        "  }\n "+
-        "}";
-                        
+        String sampleJsonld = "{\n " +
+                "  \"@context\": {\n " +
+                "    \"m\": \"http://www.example.org/meeting_organization#\",\n " +
+                "    \"p\": \"http://www.example.org/personal_details#\",\n " +
+                "    \"rdf\": \"http://www.w3.org/1999/02/22-rdf-syntax-ns#\",\n " +
+                "    \"rdfs\": \"http://www.w3.org/2000/01/rdf-schema#\",\n " +
+                "    \"xsd\": \"http://www.w3.org/2001/XMLSchema#\"\n " +
+                "  },\n " +
+                "  \"@id\": \"http://www.example.org/people#fred\",\n " +
+                "  \"m:attending\": {\n " +
+                "    \"@id\": \"http://meetings.example.com/cal#m1\"\n " +
+                "  },\n " +
+                "  \"p:GivenName\": \"Fred\",\n " +
+                "  \"p:hasEmail\": {\n " +
+                "    \"@id\": \"mailto:fred@example.com\"\n " +
+                "  }\n " +
+                "}";
+
         InputStream input = new ByteArrayInputStream(sampleJsonld.getBytes("UTF-8"));
-        
+
         SUT = new RdfTripleImporter(RdfTripleImporter.Mode.JSONLD);
         parseOneFile(SUT, input);
 
@@ -354,5 +358,5 @@ public class RdfTripleImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "mailto:fred@example.com");
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "Fred");
         Assert.assertEquals(project.rows.get(0).cells.get(3).value, "http://meetings.example.com/cal#m1");
-    } 
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/TextFormatGuesserTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/TextFormatGuesserTests.java
index adf3ff4c4..aae031925 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/TextFormatGuesserTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/TextFormatGuesserTests.java
@@ -33,7 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.importers;
 
-
 import static org.testng.Assert.assertEquals;
 
 import java.io.File;
@@ -56,7 +55,6 @@ import org.testng.annotations.Test;
 import com.google.common.io.PatternFilenameFilter;
 import com.google.refine.importing.FormatGuesser;
 
-
 public class TextFormatGuesserTests extends ImporterTest {
 
     FormatGuesser guesser;
@@ -76,7 +74,7 @@ public class TextFormatGuesserTests extends ImporterTest {
 
     @Override
     @AfterMethod
-    public void tearDown(){
+    public void tearDown() {
         guesser = null;
         super.tearDown();
     }
@@ -102,7 +100,7 @@ public class TextFormatGuesserTests extends ImporterTest {
         extensionGuesserTests("tsv", "text/line-based");
     }
 
-    @Test(enabled=false) // FIXME: Our JSON guesser doesn't work on small files
+    @Test(enabled = false) // FIXME: Our JSON guesser doesn't work on small files
     public void jsonGuesserTest() {
         extensionGuesserTests("json", "text/json");
     }
@@ -115,7 +113,7 @@ public class TextFormatGuesserTests extends ImporterTest {
     private void extensionGuesserTests(String extension, String expectedFormat) {
         String dir = ClassLoader.getSystemResource("food.csv").getPath();
         dir = dir.substring(0, dir.lastIndexOf('/'));
-        File testDataDir =  new File(dir);
+        File testDataDir = new File(dir);
         for (String testFile : testDataDir.list(new PatternFilenameFilter(".+\\." + extension))) {
             String format = guesser.guess(new File(dir, testFile), "UTF-8", "text");
             assertEquals(format, expectedFormat, "Format guess failed for " + testFile);
@@ -139,8 +137,7 @@ public class TextFormatGuesserTests extends ImporterTest {
         File tmp = File.createTempFile("openrefinetests-textguesser", "");
         OutputStreamWriter writer = new OutputStreamWriter(
                 new FileOutputStream(tmp),
-                Charset.forName("UTF-8").newEncoder()
-                );
+                Charset.forName("UTF-8").newEncoder());
         writer.write(input);
         writer.close();
         String format = guesser.guess(tmp, "UTF-8", "text");
@@ -163,43 +160,45 @@ public class TextFormatGuesserTests extends ImporterTest {
     }
 
     @Test
-    public void guessTableWithLinks() throws FileNotFoundException, IOException  {
+    public void guessTableWithLinks() throws FileNotFoundException, IOException {
 
-        // Data credits: Wikipedia contributors, https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
+        // Data credits: Wikipedia contributors,
+        // https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
         String input = "\n"
-                +"{|\n"
-                +"|-\n"
-                +"| [[Europäisches Zentrum für die Förderung der Berufsbildung|Cedefop]] || Cedefop || http://www.cedefop.europa.eu/\n"
-                +"|-\n"
-                +"| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || EUROFOUND || [http://www.eurofound.europa.eu/]\n"
-                +"|-\n"
-                +"| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/ europa.eu]\n"
-                +"|-\n"
-                +"|}\n";
+                + "{|\n"
+                + "|-\n"
+                + "| [[Europäisches Zentrum für die Förderung der Berufsbildung|Cedefop]] || Cedefop || http://www.cedefop.europa.eu/\n"
+                + "|-\n"
+                + "| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || EUROFOUND || [http://www.eurofound.europa.eu/]\n"
+                + "|-\n"
+                + "| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/ europa.eu]\n"
+                + "|-\n"
+                + "|}\n";
         testWikiTableString(input);
     }
 
     @Test
     public void readStyledTableWithHeader() throws FileNotFoundException, IOException {
-        // Data credits: Wikipedia contributors, https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
+        // Data credits: Wikipedia contributors,
+        // https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
         String input = "\n"
-                +"==Agenturen==\n"
-                +"{| class=\"wikitable sortable\"\n"
-                +"! style=\"text-align:left; width: 60em\" | Offizieller Name\n"
-                +"! style=\"text-align:left; width: 9em\" | Abkürzung\n"
-                +"! style=\"text-align:left; width: 6em\" | Website\n"
-                +"! style=\"text-align:left; width: 15em\" | Standort\n"
-                +"! style=\"text-align:left; width: 18em\" | Staat\n"
-                +"! style=\"text-align:left; width: 6em\" | Gründung\n"
-                +"! style=\"text-align:left; width: 50em\" | Anmerkungen\n"
-                +"|-\n"
-                +"| [[Europäisches Zentrum für die Förderung der Berufsbildung]] || '''Cedefop''' || [http://www.cedefop.europa.eu/] || [[Thessaloniki]] || {{Griechenland}} || 1975 ||\n"
-                +"|-\n"
-                +"| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || ''EUROFOUND'' || [http://www.eurofound.europa.eu/] || [[Dublin]] || {{Irland}} || 1975 ||\n"
-                +"|-\n"
-                +"| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/] || [[Lissabon]] || {{Portugal}} || 1993 ||\n"
-                +"|-\n"
-                +"|}\n";
+                + "==Agenturen==\n"
+                + "{| class=\"wikitable sortable\"\n"
+                + "! style=\"text-align:left; width: 60em\" | Offizieller Name\n"
+                + "! style=\"text-align:left; width: 9em\" | Abkürzung\n"
+                + "! style=\"text-align:left; width: 6em\" | Website\n"
+                + "! style=\"text-align:left; width: 15em\" | Standort\n"
+                + "! style=\"text-align:left; width: 18em\" | Staat\n"
+                + "! style=\"text-align:left; width: 6em\" | Gründung\n"
+                + "! style=\"text-align:left; width: 50em\" | Anmerkungen\n"
+                + "|-\n"
+                + "| [[Europäisches Zentrum für die Förderung der Berufsbildung]] || '''Cedefop''' || [http://www.cedefop.europa.eu/] || [[Thessaloniki]] || {{Griechenland}} || 1975 ||\n"
+                + "|-\n"
+                + "| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || ''EUROFOUND'' || [http://www.eurofound.europa.eu/] || [[Dublin]] || {{Irland}} || 1975 ||\n"
+                + "|-\n"
+                + "| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/] || [[Lissabon]] || {{Portugal}} || 1993 ||\n"
+                + "|-\n"
+                + "|}\n";
         testWikiTableString(input);
     }
 
@@ -207,19 +206,19 @@ public class TextFormatGuesserTests extends ImporterTest {
     public void guessTableWithSpanningCells() throws FileNotFoundException, IOException {
         // inspired from https://www.mediawiki.org/wiki/Help:Tables
         String input = "{| class=\"wikitable\"\n"
-                +"!colspan=\"6\"|Shopping List\n"
-                +"|-\n"
-                +"|Bread & Butter\n"
-                +"|Pie\n"
-                +"|Buns\n"
-                +"|rowspan=\"2\"|Danish\n"
-                +"|colspan=\"2\"|Croissant\n"
-                +"|-\n"
-                +"|Cheese\n"
-                +"|colspan=\"2\"|Ice cream\n"
-                +"|Butter\n"
-                +"|Yogurt\n"
-                +"|}\n";
+                + "!colspan=\"6\"|Shopping List\n"
+                + "|-\n"
+                + "|Bread & Butter\n"
+                + "|Pie\n"
+                + "|Buns\n"
+                + "|rowspan=\"2\"|Danish\n"
+                + "|colspan=\"2\"|Croissant\n"
+                + "|-\n"
+                + "|Cheese\n"
+                + "|colspan=\"2\"|Ice cream\n"
+                + "|Butter\n"
+                + "|Yogurt\n"
+                + "|}\n";
         testWikiTableString(input);
     }
 
@@ -227,15 +226,15 @@ public class TextFormatGuesserTests extends ImporterTest {
     public void guessTableWithReferences() throws FileNotFoundException, IOException {
         // inspired from https://www.mediawiki.org/wiki/Help:Tables
         String input = "{|\n"
-                +"! price\n"
-                +"! fruit\n"
-                +"! merchant\n"
-                +"|-\n"
-                +"| a || b <ref name=\"myref\"> See [http://gnu.org here]</ref>  || c <ref name=\"ms\"> or http://microsoft.com/ </ref>\n"
-                +"|-\n"
-                +"| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
-                +"|-\n"
-                +"|}\n";
+                + "! price\n"
+                + "! fruit\n"
+                + "! merchant\n"
+                + "|-\n"
+                + "| a || b <ref name=\"myref\"> See [http://gnu.org here]</ref>  || c <ref name=\"ms\"> or http://microsoft.com/ </ref>\n"
+                + "|-\n"
+                + "| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
+                + "|-\n"
+                + "|}\n";
         testWikiTableString(input);
     }
 
@@ -243,19 +242,18 @@ public class TextFormatGuesserTests extends ImporterTest {
     public void guessTableWithReferencesTemplates() throws FileNotFoundException, IOException {
         // inspired from https://www.mediawiki.org/wiki/Help:Tables
         String input = "{|\n"
-                +"! price\n"
-                +"! fruit\n"
-                +"! merchant\n"
-                +"|-\n"
-                +"| a || b <ref name=\"myref\">{{cite web|url=http://gnu.org|accessdate=2017-08-30}}</ref>  || c <ref name=\"ms\"> or {{cite journal|url=http://microsoft.com/|title=BLah}} </ref>\n"
-                +"|-\n"
-                +"| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
-                +"|-\n"
-                +"|}\n";
+                + "! price\n"
+                + "! fruit\n"
+                + "! merchant\n"
+                + "|-\n"
+                + "| a || b <ref name=\"myref\">{{cite web|url=http://gnu.org|accessdate=2017-08-30}}</ref>  || c <ref name=\"ms\"> or {{cite journal|url=http://microsoft.com/|title=BLah}} </ref>\n"
+                + "|-\n"
+                + "| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
+                + "|-\n"
+                + "|}\n";
         testWikiTableString(input);
     }
 
-
     @Test
     public void guessTableWithTemplates() throws FileNotFoundException, IOException {
         String input = "\n"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java
index 35f4a9dc1..1aa88bf2e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/TsvCsvImporterTests.java
@@ -53,10 +53,10 @@ public class TsvCsvImporterTests extends ImporterTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //constants
+    // constants
     String SAMPLE_ROW = "NDB_No,Shrt_Desc,Water";
 
-    //System Under Test
+    // System Under Test
     SeparatorBasedImporter SUT = null;
 
     @Override
@@ -68,22 +68,22 @@ public class TsvCsvImporterTests extends ImporterTest {
 
     @Override
     @AfterMethod
-    public void tearDown(){
+    public void tearDown() {
         SUT = null;
         super.tearDown();
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readJustColumns(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readJustColumns(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3";
-        
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -92,20 +92,19 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readSimpleData_CSV_1Header_1Row(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readSimpleData_CSV_1Header_1Row(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "data1" + inputSeparator + "data2" + inputSeparator + "data3";
-        
-        
+                "data1" + inputSeparator + "data2" + inputSeparator + "data3";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
-        
+
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
         Assert.assertEquals(project.columnModel.columns.get(1).getName(), "col2");
@@ -118,17 +117,17 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readSimpleData_CSV_1Header_1Row_GuessValues(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readSimpleData_CSV_1Header_1Row_GuessValues(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "data1" + inputSeparator + "234" + inputSeparator + "data3";
-        
+                "data1" + inputSeparator + "234" + inputSeparator + "data3";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, true, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -143,16 +142,16 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readSimpleData_0Header_1Row(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readSimpleData_0Header_1Row(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "data1" + inputSeparator + "data2" + inputSeparator + "data3";
-        
+
         try {
             prepareOptions(sep, -1, 0, 0, 0, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "Column 1");
@@ -165,17 +164,17 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
 
-    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readDoesNotTrimLeadingTrailingWhitespace(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readDoesNotTrimLeadingTrailingWhitespace(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = " data1 " + inputSeparator + " 3.4 " + inputSeparator + " data3 ";
-        
+
         try {
             prepareOptions(sep, -1, 0, 0, 0, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 1);
@@ -186,16 +185,16 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readDoesNotTrimLeadingWhitespace(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readDoesNotTrimLeadingWhitespace(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = " data1" + inputSeparator + " 12" + inputSeparator + " data3";
-        
+
         try {
             prepareOptions(sep, -1, 0, 0, 0, true, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 1);
@@ -205,17 +204,17 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, " data3");
     }
 
-    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readTrimsLeadingTrailingWhitespaceOnTrimStrings(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readTrimsLeadingTrailingWhitespaceOnTrimStrings(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = " data1 " + inputSeparator + " 3.4 " + inputSeparator + " data3 ";
 
         try {
             prepareOptions(sep, -1, 0, 0, 0, false, false, true);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 1);
@@ -225,17 +224,17 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
 
-    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readDoesNotTrimLeadingTrailingWhitespaceOnNoTrimStrings(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readDoesNotTrimLeadingTrailingWhitespaceOnNoTrimStrings(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = " data1 " + inputSeparator + " 3.4 " + inputSeparator + " data3 ";
 
         try {
             prepareOptions(sep, -1, 0, 0, 0, false, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 1);
@@ -244,18 +243,18 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, " 3.4 ");
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, " data3 ");
     }
-    
-    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void trimAndAutodetectDatatype(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void trimAndAutodetectDatatype(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = " data1 " + inputSeparator + " 3.4 " + inputSeparator + " data3 ";
 
         try {
             prepareOptions(sep, -1, 0, 0, 0, true, false, true);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 1);
@@ -265,18 +264,17 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
 
-
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readCanAddNull(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readCanAddNull(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = " data1" + inputSeparator + inputSeparator + " data3";
-        
+
         try {
             prepareOptions(sep, -1, 0, 0, 0, true, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 1);
@@ -287,18 +285,18 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readSimpleData_2Header_1Row(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readSimpleData_2Header_1Row(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "sub1" + inputSeparator + "sub2" + inputSeparator + "sub3\n" +
-                       "data1" + inputSeparator + "data2" + inputSeparator + "data3";
-        
+                "sub1" + inputSeparator + "sub2" + inputSeparator + "sub3\n" +
+                "data1" + inputSeparator + "data2" + inputSeparator + "data3";
+
         try {
             prepareOptions(sep, -1, 0, 0, 2, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1 sub1");
@@ -312,17 +310,18 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readSimpleData_RowLongerThanHeader(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readSimpleData_RowLongerThanHeader(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-        "data1" + inputSeparator + "data2" + inputSeparator + "data3" + inputSeparator + "data4" + inputSeparator + "data5" + inputSeparator + "data6";
-        
+                "data1" + inputSeparator + "data2" + inputSeparator + "data3" + inputSeparator + "data4" + inputSeparator + "data5"
+                + inputSeparator + "data6";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 6);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -341,18 +340,18 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(5).value, "data6");
     }
 
-    @Test(groups = { }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readQuotedData(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readQuotedData(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "\"\"\"To Be\"\" is often followed by \"\"or not To Be\"\"\"" + inputSeparator + "data2";
-        
+                "\"\"\"To Be\"\" is often followed by \"\"or not To Be\"\"\"" + inputSeparator + "data2";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -365,18 +364,18 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readIgnoreFirstLine(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readIgnoreFirstLine(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "ignore1\n" +
-                       "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "data1" + inputSeparator + "data2" + inputSeparator + "data3";
-        
+                "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
+                "data1" + inputSeparator + "data2" + inputSeparator + "data3";
+
         try {
             prepareOptions(sep, -1, 0, 1, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -390,18 +389,18 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readSkipFirstDataLine(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readSkipFirstDataLine(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "skip1\n" +
-                       "data1" + inputSeparator + "data2" + inputSeparator + "data3";
-        
+                "skip1\n" +
+                "data1" + inputSeparator + "data2" + inputSeparator + "data3";
+
         try {
             prepareOptions(sep, -1, 1, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -415,22 +414,22 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readIgnore3_Header2_Skip1(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readIgnore3_Header2_Skip1(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "ignore1\n" +
-                       "ignore2\n" +
-                       "ignore3\n" +
-                       "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "sub1" + inputSeparator + "sub2" + inputSeparator + "sub3\n" +
-                       "skip1\n" +
-                       "data1" + inputSeparator + "data2" + inputSeparator + "data3";
-        
+                "ignore2\n" +
+                "ignore3\n" +
+                "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
+                "sub1" + inputSeparator + "sub2" + inputSeparator + "sub3\n" +
+                "skip1\n" +
+                "data1" + inputSeparator + "data2" + inputSeparator + "data3";
+
         try {
             prepareOptions(sep, -1, 1, 3, 2, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1 sub1");
@@ -443,26 +442,28 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
 
-    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readIgnore3_Header2_Skip2_limit2(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readIgnore3_Header2_Skip2_limit2(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "ignore1\n" +
-                       "ignore2\n" +
-                       "ignore3\n" +
-                       "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-                       "sub1" + inputSeparator + "sub2" + inputSeparator + "sub3\n" +
-                       "skip1\n" +
-                       "skip2\n" +
-                       "data-row1-cell1" + inputSeparator + "data-row1-cell2" + inputSeparator + "data-row1-cell3\n" +
-                       "data-row2-cell1" + inputSeparator + "data-row2-cell2" + inputSeparator + "\n" + //missing last data point of this row on purpose
-                       "data-row3-cell1" + inputSeparator + "data-row3-cell2" + inputSeparator + "data-row1-cell3";
-        
+                "ignore2\n" +
+                "ignore3\n" +
+                "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
+                "sub1" + inputSeparator + "sub2" + inputSeparator + "sub3\n" +
+                "skip1\n" +
+                "skip2\n" +
+                "data-row1-cell1" + inputSeparator + "data-row1-cell2" + inputSeparator + "data-row1-cell3\n" +
+                "data-row2-cell1" + inputSeparator + "data-row2-cell2" + inputSeparator + "\n" + // missing last data
+                                                                                                 // point of this row on
+                                                                                                 // purpose
+                "data-row3-cell1" + inputSeparator + "data-row3-cell2" + inputSeparator + "data-row1-cell3";
+
         try {
             prepareOptions(sep, 2, 2, 3, 2, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1 sub1");
@@ -480,15 +481,15 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void ignoreQuotes(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void ignoreQuotes(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "data1" + inputSeparator + "data2\"" + inputSeparator + "data3" + inputSeparator + "data4";
         try {
             prepareOptions(sep, -1, 0, 0, 0, false, true);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 4);
         Assert.assertEquals(project.rows.size(), 1);
@@ -498,18 +499,18 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
 
-    @Test(groups = { }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readWithMultiLinedQuotedData(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readWithMultiLinedQuotedData(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-            "\"\"\"To\n Be\"\" is often followed by \"\"or not To\n Be\"\"\"" + inputSeparator + "data2";
-        
+                "\"\"\"To\n Be\"\" is often followed by \"\"or not To\n Be\"\"\"" + inputSeparator + "data2";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -521,18 +522,18 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "data2");
     }
 
-    @Test(groups = {  }, dataProvider = "CSV-TSV-AutoDetermine")
-    public void readWithMultiLinedQuotedDataAndBlankLines(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    @Test(groups = {}, dataProvider = "CSV-TSV-AutoDetermine")
+    public void readWithMultiLinedQuotedDataAndBlankLines(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "col1" + inputSeparator + "col2" + inputSeparator + "col3\n" +
-            "\"A line with many \n\n\n\n\n empty lines\"" + inputSeparator + "data2";
-        
+                "\"A line with many \n\n\n\n\n empty lines\"" + inputSeparator + "data2";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -544,22 +545,20 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "data2");
     }
 
-
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void customQuoteCharacter(String sep){
-        //create input to test with
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void customQuoteCharacter(String sep) {
+        // create input to test with
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "'col1'" + inputSeparator + "'col2'" + inputSeparator + "'col3'\n" +
-                       "'data1'" + inputSeparator + "'data2'" + inputSeparator + "'data3'";
-        
-        
+                "'data1'" + inputSeparator + "'data2'" + inputSeparator + "'data3'";
+
         try {
             prepareOptions(sep, -1, 0, 0, 1, false, false, "'");
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
-        
+
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
         Assert.assertEquals(project.columnModel.columns.get(1).getName(), "col2");
@@ -570,18 +569,18 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "data2");
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
-    
+
     @Test(dataProvider = "CSV-TSV-AutoDetermine")
-    public void readCustomColumnNames(String sep){
-        //create input
-        String inputSeparator =  sep == null ? "\t" : sep;
+    public void readCustomColumnNames(String sep) {
+        // create input
+        String inputSeparator = sep == null ? "\t" : sep;
         String input = "data1" + inputSeparator + "data2" + inputSeparator + "data3\n";
-        
+
         try {
-            prepareOptions(sep, -1, 0, 0, 1, false, false,"\"","[\"col1\",\"col2\",\"col3\"]", false);
+            prepareOptions(sep, -1, 0, 0, 1, false, false, "\"", "[\"col1\",\"col2\",\"col3\"]", false);
             parseOneFile(SUT, new StringReader(input));
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "col1");
@@ -591,59 +590,59 @@ public class TsvCsvImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "data2");
         Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
     }
-    
-    //---------------------read tests------------------------
+
+    // ---------------------read tests------------------------
     @Test
     public void readCsvWithProperties() {
         StringReader reader = new StringReader(SAMPLE_ROW);
-        
+
         prepareOptions(",", -1, 0, 0, 0, true, true);
-        
+
         try {
             parseOneFile(SUT, reader);
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
-        
+
         Assert.assertEquals(project.rows.size(), 1);
         Assert.assertEquals(project.rows.get(0).cells.size(), 3);
-        Assert.assertEquals((String)project.rows.get(0).cells.get(0).value, "NDB_No");
-        Assert.assertEquals((String)project.rows.get(0).cells.get(1).value, "Shrt_Desc");
-        Assert.assertEquals((String)project.rows.get(0).cells.get(2).value, "Water");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(0).value, "NDB_No");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(1).value, "Shrt_Desc");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(2).value, "Water");
     }
 
     @Test
-    public void readCsvWithPropertiesIgnoreQuotes(){
+    public void readCsvWithPropertiesIgnoreQuotes() {
         String input = "data1,data2\",data3,data4";
         StringReader reader = new StringReader(input);
 
         prepareOptions(",", -1, 0, 0, 0, true, true);
-        
+
         try {
             parseOneFile(SUT, reader);
         } catch (Exception e) {
-            Assert.fail("Exception during file parse",e);
+            Assert.fail("Exception during file parse", e);
         }
-        
+
         Assert.assertEquals(project.rows.size(), 1);
         Assert.assertEquals(project.rows.get(0).cells.size(), 4);
-        Assert.assertEquals((String)project.rows.get(0).cells.get(0).value, "data1");
-        Assert.assertEquals((String)project.rows.get(0).cells.get(1).value, "data2");
-        Assert.assertEquals((String)project.rows.get(0).cells.get(2).value, "data3");
-        Assert.assertEquals((String)project.rows.get(0).cells.get(3).value, "data4");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(0).value, "data1");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(1).value, "data2");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(2).value, "data3");
+        Assert.assertEquals((String) project.rows.get(0).cells.get(3).value, "data4");
     }
 
-    //--helpers--
+    // --helpers--
     /**
      * Used for parameterized testing for both SeparatorParser and TsvCsvParser.
      */
     @DataProvider(name = "CSV-TSV-AutoDetermine")
-    public Object[][] CSV_TSV_or_AutoDetermine(){
-        return new Object[][]{
-                {","},{"\t"},{null}
+    public Object[][] CSV_TSV_or_AutoDetermine() {
+        return new Object[][] {
+                { "," }, { "\t" }, { null }
         };
     }
-    
+
     protected void prepareOptions(
             String sep, int limit, int skip, int ignoreLines,
             int headerLines, boolean guessValueType, boolean ignoreQuotes) {
@@ -651,10 +650,10 @@ public class TsvCsvImporterTests extends ImporterTest {
     }
 
     private void prepareOptions(
-        String sep, int limit, int skip, int ignoreLines,
-        int headerLines, boolean guessValueType, boolean ignoreQuotes, String quoteCharacter) {
-        
-        prepareOptions(sep, limit, skip, ignoreLines, headerLines, guessValueType, ignoreQuotes, quoteCharacter,"[]", false);
+            String sep, int limit, int skip, int ignoreLines,
+            int headerLines, boolean guessValueType, boolean ignoreQuotes, String quoteCharacter) {
+
+        prepareOptions(sep, limit, skip, ignoreLines, headerLines, guessValueType, ignoreQuotes, quoteCharacter, "[]", false);
     }
 
     protected void prepareOptions(
@@ -669,21 +668,22 @@ public class TsvCsvImporterTests extends ImporterTest {
         whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
         whenGetBooleanOption("trimStrings", options, trimStrings);
     }
-    
+
     protected void prepareOptions(
             String sep, int limit, int skip, int ignoreLines,
-            int headerLines, boolean guessValueType, boolean ignoreQuotes, String quoteCharacter, String columnNames, boolean includeArchiveFileName) {
-            
-            whenGetStringOption("separator", options, sep);
-            whenGetStringOption("quoteCharacter", options, quoteCharacter);
-            whenGetIntegerOption("limit", options, limit);
-            whenGetIntegerOption("skipDataLines", options, skip);
-            whenGetIntegerOption("ignoreLines", options, ignoreLines);
-            whenGetIntegerOption("headerLines", options, headerLines);
-            whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
-            whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
-            whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
-            whenGetArrayOption("columnNames", options, ParsingUtilities.evaluateJsonStringToArrayNode(columnNames));
-            whenGetBooleanOption("includeArchiveFileName", options, includeArchiveFileName);
-        }
+            int headerLines, boolean guessValueType, boolean ignoreQuotes, String quoteCharacter, String columnNames,
+            boolean includeArchiveFileName) {
+
+        whenGetStringOption("separator", options, sep);
+        whenGetStringOption("quoteCharacter", options, quoteCharacter);
+        whenGetIntegerOption("limit", options, limit);
+        whenGetIntegerOption("skipDataLines", options, skip);
+        whenGetIntegerOption("ignoreLines", options, ignoreLines);
+        whenGetIntegerOption("headerLines", options, headerLines);
+        whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
+        whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
+        whenGetArrayOption("columnNames", options, ParsingUtilities.evaluateJsonStringToArrayNode(columnNames));
+        whenGetBooleanOption("includeArchiveFileName", options, includeArchiveFileName);
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java
index a748d8bff..d6e498bd0 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/WikitextImporterTests.java
@@ -33,7 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.importers;
 
-
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,7 +43,6 @@ import java.util.Map;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -57,12 +55,14 @@ import com.google.refine.model.ReconCandidate;
 import com.google.refine.model.recon.ReconJob;
 import com.google.refine.model.recon.StandardReconConfig;
 
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
 
 public class WikitextImporterTests extends ImporterTest {
 
     private WikitextImporter importer = null;
     private Map<String, Recon> mockedRecons = null;
-    
+
     @Override
     @BeforeTest
     public void init() {
@@ -79,38 +79,37 @@ public class WikitextImporterTests extends ImporterTest {
 
     @Override
     @AfterMethod
-    public void tearDown(){
+    public void tearDown() {
         importer = null;
         super.tearDown();
     }
-    
+
     @Test
     public void readSimpleData() {
-    	String input = "\n"
-		+ "{|\n"
-		+ "|-\n"
-		+ "| a || b<br/>2 || c \n"
-		+ "|-\n"
-		+ "| d || e || f<br>\n"
-		+ "|-\n"
-		+ "|}\n";
-    	try {
-    	   prepareOptions(0, 0, true, true, null);
-    	   parse(input);
-    	} catch (Exception e) {
-    	   Assert.fail("Parsing failed", e);
-    	}
-    	Assert.assertEquals(project.columnModel.columns.size(), 3);
-    	Assert.assertEquals(project.rows.size(), 2);
+        String input = "\n"
+                + "{|\n"
+                + "|-\n"
+                + "| a || b<br/>2 || c \n"
+                + "|-\n"
+                + "| d || e || f<br>\n"
+                + "|-\n"
+                + "|}\n";
+        try {
+            prepareOptions(0, 0, true, true, null, null);
+            parse(input);
+        } catch (Exception e) {
+            Assert.fail("Parsing failed", e);
+        }
+        Assert.assertEquals(project.columnModel.columns.size(), 3);
+        Assert.assertEquals(project.rows.size(), 2);
         Assert.assertEquals(project.rows.get(0).cells.size(), 3);
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "a");
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "b\n2");
         Assert.assertEquals(project.rows.get(1).cells.get(2).value, "f");
     }
-    
+
     /**
-     * Issue #1448
-     * https://github.com/OpenRefine/OpenRefine/issues/1448
+     * Issue #1448 https://github.com/OpenRefine/OpenRefine/issues/1448
      */
     @Test
     public void readTableWithMisplacedHeaders() {
@@ -125,10 +124,10 @@ public class WikitextImporterTests extends ImporterTest {
                 + "|-\n"
                 + "|}\n";
         try {
-           prepareOptions(0, 0, true, true, null);
-           parse(input);
+            prepareOptions(0, 0, true, true, null, null);
+            parse(input);
         } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+            Assert.fail("Parsing failed", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 2);
@@ -136,107 +135,81 @@ public class WikitextImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(1).cells.get(1).value, "e");
         Assert.assertEquals(project.rows.get(1).cells.get(2).value, "f");
     }
-    
-    @BeforeMethod
-    public void mockReconCalls() throws Exception {
-        StandardReconConfig cfg = Mockito.spy(new StandardReconConfig(
-                "http://endpoint.com", "http://schemaspace", "http://schemaspace.com", null, true, Collections.emptyList(), 0));
-        PowerMockito.whenNew(StandardReconConfig.class).withAnyArguments().thenReturn(cfg);
-        Answer<List<Recon>> mockedResponse = new Answer<List<Recon>>() {
-            @Override
-            public List<Recon> answer(InvocationOnMock invocation) throws Throwable {
-                return fakeReconCall(invocation.getArgument(0));
-            }
-        };
-        PowerMockito.doAnswer(mockedResponse).when(cfg, "batchRecon", Mockito.any(), Mockito.anyLong());
-    }
-    
-    private List<Recon> fakeReconCall(List<ReconJob> jobs) {
-        List<Recon> result = new ArrayList<>();
-        for(ReconJob job : jobs) {
-            result.add(mockedRecons.get(job.toString()));
-        }
-        return result;
-    }
-    
-    @Test(enabled = false) // disabled due to flakiness on CI
+
     public void readTableWithLinks() throws Exception {
-        // This mock is used to avoid real network connection during test
-        Recon ecdvt = Mockito.mock(Recon.class);
-        Mockito.when(ecdvt.getBestCandidate()).thenReturn(
-                new ReconCandidate("Q116214", "European Centre for the Development of Vocational Training", new String[] {"Q392918"}, 100));
-        mockedRecons.put("{\"query\":\"https://de.wikipedia.org/wiki/Europäisches Zentrum für die Förderung der Berufsbildung\"}", ecdvt);
-        Recon efilwc = Mockito.mock(Recon.class);
-        Mockito.when(efilwc.getBestCandidate()).thenReturn(
-                new ReconCandidate("Q1377549", "European Foundation for the Improvement of Living and Working Conditions", new String[] {"Q392918"}, 100));
-        mockedRecons.put("{\"query\":\"https://de.wikipedia.org/wiki/Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen\"}", efilwc);
-        Recon emcdda = Mockito.mock(Recon.class);
-        Mockito.when(emcdda.getBestCandidate()).thenReturn(
-                new ReconCandidate("Q1377256", "European Monitoring Centre for Drugs and Drug Addiction", new String[] {"Q392918"}, 100));
-        mockedRecons.put("{\"query\":\"https://de.wikipedia.org/wiki/Europäische Beobachtungsstelle für Drogen und Drogensucht\"}", emcdda);
 
-        // Data credits: Wikipedia contributors, https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
+        // Data credits: Wikipedia contributors,
+        // https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
         String input = "\n"
-            +"{|\n"
-            +"|-\n"
-            +"| [[Europäisches Zentrum für die Förderung der Berufsbildung|Cedefop]] || Cedefop || http://www.cedefop.europa.eu/\n"
-            +"|-\n"
-            +"| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || EUROFOUND || [http://www.eurofound.europa.eu/]\n"
-            +"|-\n"
-            +"| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/ europa.eu]\n"
-            +"|-\n"
-            +"|}\n";
+                + "{|\n"
+                + "|-\n"
+                + "| [[Europäisches Zentrum für die Förderung der Berufsbildung|Cedefop]] || Cedefop || http://www.cedefop.europa.eu/\n"
+                + "|-\n"
+                + "| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || EUROFOUND || [http://www.eurofound.europa.eu/]\n"
+                + "|-\n"
+                + "| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/ europa.eu]\n"
+                + "|-\n"
+                + "|}\n";
 
-        try {
-           prepareOptions(0, 0, true, true, "https://de.wikipedia.org/wiki/");
-           parse(input);
-        } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+        try (MockWebServer server = new MockWebServer()) {
+            server.start();
+            String jsonResponse = "{\"q0\":[{\"id\":\"Q1377256\",\"name\":\"Europäische Beobachtungsstelle für Drogen und Drogensucht\"}],"
+                    + "\"q1\":[{\"id\":\"Q1377549\",\"name\":\"European Foundation for the Improvement of Living and Working Conditions\"}],"
+                    + "\"q2\":[{\"id\":\"Q1377256\",\"name\":\"European Monitoring Centre for Drugs and Drug Addiction\"}]}";
+            server.enqueue(new MockResponse().setBody(jsonResponse));
+
+            try {
+                prepareOptions(0, 0, true, true, "https://de.wikipedia.org/wiki/", server.url("endpoint").url().toString());
+                parse(input);
+            } catch (Exception e) {
+                Assert.fail("Parsing failed", e);
+            }
+            Assert.assertEquals(project.columnModel.columns.size(), 3);
+            Assert.assertEquals(project.rows.size(), 3);
+            Assert.assertEquals(project.rows.get(0).cells.size(), 3);
+
+            // Reconciled cells
+            Assert.assertEquals(project.rows.get(0).cells.get(1).value, "Cedefop");
+            Assert.assertEquals(project.rows.get(0).cells.get(1).recon, null);
+            Assert.assertEquals(project.rows.get(2).cells.get(0).value, "Europäische Beobachtungsstelle für Drogen und Drogensucht");
+            Assert.assertEquals(project.rows.get(2).cells.get(0).recon.getBestCandidate().id, "Q1377256");
+
+            // various ways to input external links
+            Assert.assertEquals(project.rows.get(1).cells.get(2).value, "http://www.eurofound.europa.eu/");
+            Assert.assertEquals(project.rows.get(2).cells.get(2).value, "http://www.emcdda.europa.eu/");
+            // Assert.assertEquals(project.rows.get(0).cells.get(2).value, "http://www.cedefop.europa.eu/");
+            // unfortunately the above does not seem to be supported by the parser (parsed as blank instead)
         }
-        Assert.assertEquals(project.columnModel.columns.size(), 3);
-        Assert.assertEquals(project.rows.size(), 3);
-        Assert.assertEquals(project.rows.get(0).cells.size(), 3);
-        
-        // Reconciled cells
-        Assert.assertEquals(project.rows.get(0).cells.get(1).value, "Cedefop");
-        Assert.assertEquals(project.rows.get(0).cells.get(1).recon, null);
-        Assert.assertEquals(project.rows.get(2).cells.get(0).value, "Europäische Beobachtungsstelle für Drogen und Drogensucht");
-        Assert.assertEquals(project.rows.get(2).cells.get(0).recon.getBestCandidate().id, "Q1377256");
-        
-        // various ways to input external links
-        Assert.assertEquals(project.rows.get(1).cells.get(2).value, "http://www.eurofound.europa.eu/");
-        Assert.assertEquals(project.rows.get(2).cells.get(2).value, "http://www.emcdda.europa.eu/");
-        // Assert.assertEquals(project.rows.get(0).cells.get(2).value, "http://www.cedefop.europa.eu/");
-        // unfortunately the above does not seem to be supported by the parser (parsed as blank instead)
     }
 
     @Test
     public void readStyledTableWithHeader() {
-        // Data credits: Wikipedia contributors, https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
+        // Data credits: Wikipedia contributors,
+        // https://de.wikipedia.org/w/index.php?title=Agenturen_der_Europäischen_Union&action=edit
         String input = "\n"
-            +"==Agenturen==\n"
-            +"{| class=\"wikitable sortable\"\n"
-            +"! style=\"text-align:left; width: 60em\" | Offizieller Name\n"
-            +"! style=\"text-align:left; width: 9em\" | Abkürzung\n"
-            +"! style=\"text-align:left; width: 6em\" | Website\n"
-            +"! style=\"text-align:left; width: 15em\" | Standort\n"
-            +"! style=\"text-align:left; width: 18em\" | Staat\n"
-            +"! style=\"text-align:left; width: 6em\" | Gründung\n"
-            +"! style=\"text-align:left; width: 50em\" | Anmerkungen\n"
-            +"|-\n"
-            +"| [[Europäisches Zentrum für die Förderung der Berufsbildung]] || '''Cedefop''' || [http://www.cedefop.europa.eu/] || [[Thessaloniki]] || {{Griechenland}} || 1975 ||\n"
-            +"|-\n"
-            +"| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || ''EUROFOUND'' || [http://www.eurofound.europa.eu/] || [[Dublin]] || {{Irland}} || 1975 ||\n"
-            +"|-\n"
-            +"| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/] || [[Lissabon]] || {{Portugal}} || 1993 ||\n"
-            +"|-\n"
-            +"|}\n";
+                + "==Agenturen==\n"
+                + "{| class=\"wikitable sortable\"\n"
+                + "! style=\"text-align:left; width: 60em\" | Offizieller Name\n"
+                + "! style=\"text-align:left; width: 9em\" | Abkürzung\n"
+                + "! style=\"text-align:left; width: 6em\" | Website\n"
+                + "! style=\"text-align:left; width: 15em\" | Standort\n"
+                + "! style=\"text-align:left; width: 18em\" | Staat\n"
+                + "! style=\"text-align:left; width: 6em\" | Gründung\n"
+                + "! style=\"text-align:left; width: 50em\" | Anmerkungen\n"
+                + "|-\n"
+                + "| [[Europäisches Zentrum für die Förderung der Berufsbildung]] || '''Cedefop''' || [http://www.cedefop.europa.eu/] || [[Thessaloniki]] || {{Griechenland}} || 1975 ||\n"
+                + "|-\n"
+                + "| [[Europäische Stiftung zur Verbesserung der Lebens- und Arbeitsbedingungen]] || ''EUROFOUND'' || [http://www.eurofound.europa.eu/] || [[Dublin]] || {{Irland}} || 1975 ||\n"
+                + "|-\n"
+                + "| [[Europäische Beobachtungsstelle für Drogen und Drogensucht]] || EMCDDA || [http://www.emcdda.europa.eu/] || [[Lissabon]] || {{Portugal}} || 1993 ||\n"
+                + "|-\n"
+                + "|}\n";
 
         try {
-           prepareOptions(-1, 1, true, true, null);
-           parse(input);
+            prepareOptions(-1, 1, true, true, null, null);
+            parse(input);
         } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+            Assert.fail("Parsing failed", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 7);
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "Europäisches Zentrum für die Förderung der Berufsbildung");
@@ -244,58 +217,58 @@ public class WikitextImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(1).cells.get(1).value, "EUROFOUND");
         Assert.assertEquals(project.columnModel.columns.get(0).getName(), "Offizieller Name");
         Assert.assertEquals(project.columnModel.columns.get(6).getName(), "Anmerkungen");
-        Assert.assertEquals(project.rows.get(0).cells.size(), 7);  
+        Assert.assertEquals(project.rows.get(0).cells.size(), 7);
     }
 
     @Test
     public void readTableWithSpanningCells() {
         // inspired from https://www.mediawiki.org/wiki/Help:Tables
         String input = "{| class=\"wikitable\"\n"
-        +"!colspan=\"6\"|Shopping List\n"
-        +"|-\n"
-        +"|Bread & Butter\n"
-        +"|Pie\n"
-        +"|Buns\n"
-        +"|rowspan=\"2\"|Danish\n"
-        +"|colspan=\"2\"|Croissant\n"
-        +"|-\n"
-        +"|Cheese\n"
-        +"|colspan=\"2\"|Ice cream\n"
-        +"|Butter\n"
-        +"|Yogurt\n"
-        +"|}\n";
-        
+                + "!colspan=\"6\"|Shopping List\n"
+                + "|-\n"
+                + "|Bread & Butter\n"
+                + "|Pie\n"
+                + "|Buns\n"
+                + "|rowspan=\"2\"|Danish\n"
+                + "|colspan=\"2\"|Croissant\n"
+                + "|-\n"
+                + "|Cheese\n"
+                + "|colspan=\"2\"|Ice cream\n"
+                + "|Butter\n"
+                + "|Yogurt\n"
+                + "|}\n";
+
         try {
-           prepareOptions(-1, 1, true, true, null);
-           parse(input);
+            prepareOptions(-1, 1, true, true, null, null);
+            parse(input);
         } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+            Assert.fail("Parsing failed", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 6);
         Assert.assertNull(project.rows.get(1).cells.get(2));
         Assert.assertNull(project.rows.get(1).cells.get(3));
         Assert.assertEquals(project.rows.get(1).cells.get(4).value, "Butter");
     }
-    
+
     @Test
     public void readTableWithReferences() {
         // inspired from https://www.mediawiki.org/wiki/Help:Tables
         String input = "{|\n"
-        +"! price\n"
-        +"! fruit\n"
-        +"! merchant\n"
-        +"|-\n"
-        +"| a || b <ref name=\"myref\"> See [http://gnu.org here]</ref>  || c <ref name=\"ms\"> or http://microsoft.com/ </ref>\n"
-        +"|-\n"
-        +"| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
-        +"|-\n"
-        +"|}\n";
-        
+                + "! price\n"
+                + "! fruit\n"
+                + "! merchant\n"
+                + "|-\n"
+                + "| a || b <ref name=\"myref\"> See [http://gnu.org here]</ref>  || c <ref name=\"ms\"> or http://microsoft.com/ </ref>\n"
+                + "|-\n"
+                + "| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
+                + "|-\n"
+                + "|}\n";
+
         try {
-           prepareOptions(-1, 1, true, true, null);
-           parse(input);
+            prepareOptions(-1, 1, true, true, null, null);
+            parse(input);
         } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+            Assert.fail("Parsing failed", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 5);
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "b");
@@ -309,21 +282,21 @@ public class WikitextImporterTests extends ImporterTest {
     public void readTableWithReferencesTemplates() {
         // inspired from https://www.mediawiki.org/wiki/Help:Tables
         String input = "{|\n"
-        +"! price\n"
-        +"! fruit\n"
-        +"! merchant\n"
-        +"|-\n"
-        +"| a || b <ref name=\"myref\">{{cite web|url=http://gnu.org|accessdate=2017-08-30}}</ref>  || c <ref name=\"ms\"> or {{cite journal|url=http://microsoft.com/|title=BLah}} </ref>\n"
-        +"|-\n"
-        +"| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
-        +"|-\n"
-        +"|}\n";
-        
+                + "! price\n"
+                + "! fruit\n"
+                + "! merchant\n"
+                + "|-\n"
+                + "| a || b <ref name=\"myref\">{{cite web|url=http://gnu.org|accessdate=2017-08-30}}</ref>  || c <ref name=\"ms\"> or {{cite journal|url=http://microsoft.com/|title=BLah}} </ref>\n"
+                + "|-\n"
+                + "| d || e <ref name=\"ms\"/>|| f <ref name=\"myref\" />\n"
+                + "|-\n"
+                + "|}\n";
+
         try {
-           prepareOptions(-1, 1, true, true, null);
-           parse(input);
+            prepareOptions(-1, 1, true, true, null, null);
+            parse(input);
         } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+            Assert.fail("Parsing failed", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 5);
         Assert.assertEquals(project.rows.get(0).cells.get(1).value, "b");
@@ -332,7 +305,7 @@ public class WikitextImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(1).cells.get(4).value, "http://gnu.org");
         Assert.assertEquals(project.rows.get(1).cells.get(2).value, "http://microsoft.com/");
     }
-    
+
     /**
      * Include templates and image filenames
      */
@@ -349,10 +322,10 @@ public class WikitextImporterTests extends ImporterTest {
                 + "|-\n"
                 + "|}\n";
         try {
-           prepareOptions(0, 0, true, true, null);
-           parse(input);
+            prepareOptions(0, 0, true, true, null, null);
+            parse(input);
         } catch (Exception e) {
-           Assert.fail("Parsing failed", e);
+            Assert.fail("Parsing failed", e);
         }
         Assert.assertEquals(project.columnModel.columns.size(), 3);
         Assert.assertEquals(project.rows.size(), 2);
@@ -361,16 +334,16 @@ public class WikitextImporterTests extends ImporterTest {
         Assert.assertEquals(project.rows.get(1).cells.get(1).value, "[[File:My logo.svg]]");
     }
 
-    //--helpers--
-    
+    // --helpers--
+
     private void parse(String wikitext) {
-    	parseOneFile(importer, new StringReader(wikitext));
+        parseOneFile(importer, new StringReader(wikitext));
     }
 
     private void prepareOptions(
-        int limit, int headerLines, boolean blankSpanningCells,
-        boolean guessValueType, String wikiUrl) {
-        
+            int limit, int headerLines, boolean blankSpanningCells,
+            boolean guessValueType, String wikiUrl, String reconEndpoint) {
+
         whenGetIntegerOption("limit", options, limit);
         whenGetIntegerOption("headerLines", options, headerLines);
         whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
@@ -379,6 +352,6 @@ public class WikitextImporterTests extends ImporterTest {
         whenGetBooleanOption("parseReferences", options, true);
         whenGetBooleanOption("includeRawTemplates", options, true);
         whenGetStringOption("wikiUrl", options, wikiUrl);
-        whenGetStringOption("reconService", options, "https://tools.wmflabs.org/openrefine-wikidata/en/api");
+        whenGetStringOption("reconService", options, reconEndpoint);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java
index e3a5d237a..a38bfd695 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesStub.java
@@ -44,8 +44,8 @@ import com.google.refine.importers.tree.XmlImportUtilities;
 import com.google.refine.model.Project;
 
 public class XmlImportUtilitiesStub extends XmlImportUtilities {
-    
-    public List<String> detectRecordElementWrapper(TreeReader parser, String tag) throws Exception{
+
+    public List<String> detectRecordElementWrapper(TreeReader parser, String tag) throws Exception {
         return super.detectRecordElement(parser, tag);
     }
 
@@ -63,7 +63,6 @@ public class XmlImportUtilitiesStub extends XmlImportUtilities {
         super.findRecord(project, parser, recordPath, pathIndex, rootColumnGroup, limit, parameters);
     }
 
-
     public void findRecordWrapper(Project project, TreeReader parser, String[] recordPath, int pathIndex,
             ImportColumnGroup rootColumnGroup, int limit, boolean trimStrings, boolean storeEmptyStrings,
             boolean guessDataType) throws Exception {
@@ -78,7 +77,6 @@ public class XmlImportUtilitiesStub extends XmlImportUtilities {
         super.processRecord(project, parser, rootColumnGroup, parameters);
     }
 
-
     public void processRecordWrapper(Project project, TreeReader parser, ImportColumnGroup rootColumnGroup,
             boolean trimStrings, boolean storeEmptyStrings, boolean guessDataType)
             throws Exception {
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java
index cbd27b42d..2e87fa648 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImportUtilitiesTests.java
@@ -61,7 +61,6 @@ import com.google.refine.importers.tree.TreeReaderException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
 
-
 public class XmlImportUtilitiesTests extends RefineTest {
 
     @Override
@@ -70,18 +69,18 @@ public class XmlImportUtilitiesTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
     }
 
-    //dependencies
+    // dependencies
     Project project;
     TreeReader parser;
     ImportColumnGroup columnGroup;
     ImportRecord record;
     ByteArrayInputStream inputStream;
 
-    //System Under Test
+    // System Under Test
     XmlImportUtilitiesStub SUT;
 
     @BeforeMethod
-    public void SetUp(){
+    public void SetUp() {
         SUT = new XmlImportUtilitiesStub();
         project = new Project();
         columnGroup = new ImportColumnGroup();
@@ -89,20 +88,20 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @AfterMethod
-    public void TearDown() throws IOException{
+    public void TearDown() throws IOException {
         SUT = null;
         project = null;
         parser = null;
         columnGroup = null;
         record = null;
-        if(inputStream != null) {
+        if (inputStream != null) {
             inputStream.close();
         }
         inputStream = null;
     }
 
     @Test
-    public void detectPathFromTagXmlTest() throws TreeReaderException{
+    public void detectPathFromTagXmlTest() throws TreeReaderException {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
 
         String tag = "library";
@@ -115,7 +114,7 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void detectPathFromTagWithNestedElementXml() throws TreeReaderException{
+    public void detectPathFromTagWithNestedElementXml() throws TreeReaderException {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
         String tag = "book";
 
@@ -129,11 +128,11 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void detectRecordElementXmlTest(){
+    public void detectRecordElementXmlTest() {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
         createXmlParser();
 
-        String tag="library";
+        String tag = "library";
 
         List<String> response = new ArrayList<String>();
         try {
@@ -147,11 +146,11 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void detectRecordElementCanHandleWithNestedElementsXml(){
+    public void detectRecordElementCanHandleWithNestedElementsXml() {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
         createXmlParser();
 
-        String tag="book";
+        String tag = "book";
 
         List<String> response = new ArrayList<String>();
         try {
@@ -166,11 +165,11 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void detectRecordElementIsNullForUnfoundTagXml(){
+    public void detectRecordElementIsNullForUnfoundTagXml() {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
         createXmlParser();
 
-        String tag="";
+        String tag = "";
 
         List<String> response = new ArrayList<String>();
         try {
@@ -182,7 +181,7 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void detectRecordElementRegressionXmlTest(){
+    public void detectRecordElementRegressionXmlTest() {
         loadSampleXml();
 
         String[] path = XmlImportUtilitiesStub.detectRecordElement(createXmlParser());
@@ -191,9 +190,9 @@ public class XmlImportUtilitiesTests extends RefineTest {
         Assert.assertEquals(path[0], "library");
         Assert.assertEquals(path[1], "book");
     }
-    
+
     @Test
-    public void detectRecordElementRegressionJsonTest(){
+    public void detectRecordElementRegressionJsonTest() {
         loadSampleJson();
 
         String[] path = XmlImportUtilitiesStub.detectRecordElement(
@@ -205,14 +204,14 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void importTreeDataXmlTest(){
+    public void importTreeDataXmlTest() {
         loadSampleXml();
 
-        String[] recordPath = new String[]{"library","book"};
+        String[] recordPath = new String[] { "library", "book" };
         try {
             XmlImportUtilitiesStub.importTreeData(createXmlParser(), project, recordPath, columnGroup, -1,
                     false, true, false);
-        } catch (Exception e){
+        } catch (Exception e) {
             Assert.fail();
         }
 
@@ -227,19 +226,19 @@ public class XmlImportUtilitiesTests extends RefineTest {
         Assert.assertNotNull(columnGroup.subgroups.get("book").subgroups.get("title"));
         Assert.assertNotNull(columnGroup.subgroups.get("book").subgroups.get("publish_date"));
     }
-    
+
     /**
      * Test of deprecated method which can go away when it does
      */
     @Test
-    public void importTreeDataXmlTestDeprecated(){
+    public void importTreeDataXmlTestDeprecated() {
         loadSampleXml();
 
-        String[] recordPath = new String[]{"library","book"};
+        String[] recordPath = new String[] { "library", "book" };
         try {
             XmlImportUtilitiesStub.importTreeData(createXmlParser(), project, recordPath, columnGroup, -1,
                     new ImportParameters(false, true, false));
-        } catch (Exception e){
+        } catch (Exception e) {
             Assert.fail();
         }
 
@@ -256,14 +255,14 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void importXmlWithVaryingStructureTest(){
+    public void importXmlWithVaryingStructureTest() {
         loadData(XmlImporterTests.getSampleWithVaryingStructure());
 
-        String[] recordPath = new String[]{"library", "book"};
+        String[] recordPath = new String[] { "library", "book" };
         try {
             XmlImportUtilitiesStub.importTreeData(createXmlParser(), project, recordPath, columnGroup, -1,
                     false, true, false);
-        } catch (Exception e){
+        } catch (Exception e) {
             Assert.fail();
         }
 
@@ -284,19 +283,18 @@ public class XmlImportUtilitiesTests extends RefineTest {
         Assert.assertNotNull(book.subgroups.get("genre"));
     }
 
-
     /**
      * Test using deprecated method which can go away when it does
      */
     @Test
-    public void importXmlWithVaryingStructureTestDeprecated(){
+    public void importXmlWithVaryingStructureTestDeprecated() {
         loadData(XmlImporterTests.getSampleWithVaryingStructure());
 
-        String[] recordPath = new String[]{"library", "book"};
+        String[] recordPath = new String[] { "library", "book" };
         try {
             XmlImportUtilitiesStub.importTreeData(createXmlParser(), project, recordPath, columnGroup, -1,
                     new ImportParameters(false, true, false));
-        } catch (Exception e){
+        } catch (Exception e) {
             Assert.fail();
         }
 
@@ -318,7 +316,7 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void createColumnsFromImportTest(){
+    public void createColumnsFromImportTest() {
 
         ImportColumnGroup columnGroup = new ImportColumnGroup();
         ImportColumnGroup subGroup = new ImportColumnGroup();
@@ -341,12 +339,12 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void findRecordTestXml(){
+    public void findRecordTestXml() {
         loadSampleXml();
         createXmlParser();
         ParserSkip();
 
-        String[] recordPath = new String[]{"library","book"};
+        String[] recordPath = new String[] { "library", "book" };
         int pathIndex = 0;
 
         try {
@@ -359,19 +357,19 @@ public class XmlImportUtilitiesTests extends RefineTest {
         assertProjectCreated(project, 0, 6);
 
         Assert.assertEquals(project.rows.get(0).cells.size(), 4);
-        //TODO
+        // TODO
     }
 
     /**
      * Test of deprecated wrapper method which can go away when it does
      */
     @Test
-    public void findRecordTestXmlDeprecated(){
+    public void findRecordTestXmlDeprecated() {
         loadSampleXml();
         createXmlParser();
         ParserSkip();
 
-        String[] recordPath = new String[]{"library","book"};
+        String[] recordPath = new String[] { "library", "book" };
         int pathIndex = 0;
 
         try {
@@ -384,12 +382,11 @@ public class XmlImportUtilitiesTests extends RefineTest {
         assertProjectCreated(project, 0, 6);
 
         Assert.assertEquals(project.rows.get(0).cells.size(), 4);
-        //TODO
+        // TODO
     }
 
-
     @Test
-    public void processRecordTestXml(){
+    public void processRecordTestXml() {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
         createXmlParser();
         ParserSkip();
@@ -409,8 +406,9 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void processRecordTestDuplicateColumnsXml(){
-        loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><authors><author>author1</author><author>author2</author></authors><genre>genre1</genre></book></library>");
+    public void processRecordTestDuplicateColumnsXml() {
+        loadData(
+                "<?xml version=\"1.0\"?><library><book id=\"1\"><authors><author>author1</author><author>author2</author></authors><genre>genre1</genre></book></library>");
         createXmlParser();
         ParserSkip();
 
@@ -434,8 +432,9 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void processRecordTestNestedElementXml(){
-        loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author><author-name>author1</author-name><author-dob>a date</author-dob></author><genre>genre1</genre></book></library>");
+    public void processRecordTestNestedElementXml() {
+        loadData(
+                "<?xml version=\"1.0\"?><library><book id=\"1\"><author><author-name>author1</author-name><author-dob>a date</author-dob></author><genre>genre1</genre></book></library>");
         createXmlParser();
         ParserSkip();
 
@@ -456,15 +455,14 @@ public class XmlImportUtilitiesTests extends RefineTest {
         Assert.assertEquals(row.getCell(2).value, "a date");
     }
 
-
     @Test
-    public void processSubRecordTestXml(){
+    public void processSubRecordTestXml() {
         loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author>author1</author><genre>genre1</genre></book></library>");
         createXmlParser();
         ParserSkip();
 
         try {
-            SUT.processSubRecordWrapper(project, parser, columnGroup, record,0, 
+            SUT.processSubRecordWrapper(project, parser, columnGroup, record, 0,
                     new ImportParameters(false, false, false));
         } catch (Exception e) {
             Assert.fail();
@@ -482,12 +480,13 @@ public class XmlImportUtilitiesTests extends RefineTest {
         Assert.assertNotNull(book.subgroups.get("author"));
         Assert.assertNotNull(book.subgroups.get("genre"));
 
-        //TODO check record
+        // TODO check record
     }
 
     @Test
-    public void trimLeadingTrailingWhitespaceOnTrimString(){
-        loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author><author-name>  author1  </author-name><author-dob>  a date  </author-dob></author><genre>genre1</genre></book></library>");
+    public void trimLeadingTrailingWhitespaceOnTrimString() {
+        loadData(
+                "<?xml version=\"1.0\"?><library><book id=\"1\"><author><author-name>  author1  </author-name><author-dob>  a date  </author-dob></author><genre>genre1</genre></book></library>");
         createXmlParser();
         ParserSkip();
 
@@ -509,8 +508,9 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void doesNotTrimLeadingTrailingWhitespaceOnNoTrimString(){
-        loadData("<?xml version=\"1.0\"?><library><book id=\"1\"><author><author-name>  author1  </author-name><author-dob>  a date  </author-dob></author><genre>genre1</genre></book></library>");
+    public void doesNotTrimLeadingTrailingWhitespaceOnNoTrimString() {
+        loadData(
+                "<?xml version=\"1.0\"?><library><book id=\"1\"><author><author-name>  author1  </author-name><author-dob>  a date  </author-dob></author><genre>genre1</genre></book></library>");
         createXmlParser();
         ParserSkip();
 
@@ -532,7 +532,7 @@ public class XmlImportUtilitiesTests extends RefineTest {
     }
 
     @Test
-    public void addCellTest(){
+    public void addCellTest() {
         String columnLocalName = "author";
         String text = "Author1, The";
         int commonStartingRowIndex = 0;
@@ -540,17 +540,17 @@ public class XmlImportUtilitiesTests extends RefineTest {
 
         Assert.assertNotNull(record);
         Assert.assertNotNull(record.rows);
-        //Assert.assertNotNull(record.columnEmptyRowIndices);
+        // Assert.assertNotNull(record.columnEmptyRowIndices);
         Assert.assertEquals(record.rows.size(), 1);
-        //Assert.assertEquals(record.columnEmptyRowIndices.size(), 2);
+        // Assert.assertEquals(record.columnEmptyRowIndices.size(), 2);
         Assert.assertNotNull(record.rows.get(0));
-        //Assert.assertNotNull(record.columnEmptyRowIndices.get(0));
-        //Assert.assertNotNull(record.columnEmptyRowIndices.get(1));
+        // Assert.assertNotNull(record.columnEmptyRowIndices.get(0));
+        // Assert.assertNotNull(record.columnEmptyRowIndices.get(1));
         Assert.assertEquals(record.rows.get(0).size(), 1);
         Assert.assertNotNull(record.rows.get(0).get(0));
         Assert.assertEquals(record.rows.get(0).get(0).value, "Author1, The");
-        //Assert.assertEquals(record.columnEmptyRowIndices.get(0).intValue(),0);
-        //Assert.assertEquals(record.columnEmptyRowIndices.get(1).intValue(),1);
+        // Assert.assertEquals(record.columnEmptyRowIndices.get(0).intValue(),0);
+        // Assert.assertEquals(record.columnEmptyRowIndices.get(1).intValue(),1);
 
     }
 
@@ -644,34 +644,34 @@ public class XmlImportUtilitiesTests extends RefineTest {
         Assert.assertEquals(row.getCell(2).value, "50", "Checks the value for 'per-page'");
     }
 
-    //----------------helpers-------------
-    public void loadSampleXml(){
-        loadData( XmlImporterTests.getSample() );
-    }
-    
-    public void loadSampleJson(){
-        loadData( JsonImporterTests.getSample() );
+    // ----------------helpers-------------
+    public void loadSampleXml() {
+        loadData(XmlImporterTests.getSample());
     }
 
-    public void loadData(String xml){
+    public void loadSampleJson() {
+        loadData(JsonImporterTests.getSample());
+    }
+
+    public void loadData(String xml) {
         try {
-            inputStream = new ByteArrayInputStream( xml.getBytes( "UTF-8" ) );
+            inputStream = new ByteArrayInputStream(xml.getBytes("UTF-8"));
         } catch (UnsupportedEncodingException e1) {
             Assert.fail();
         }
     }
 
-    public void ParserSkip(){
+    public void ParserSkip() {
         try {
-            if (parser.current() == TreeReader.Token.Ignorable){
-                parser.next(); //move parser forward once e.g. skip the START_DOCUMENT parser event
+            if (parser.current() == TreeReader.Token.Ignorable) {
+                parser.next(); // move parser forward once e.g. skip the START_DOCUMENT parser event
             }
         } catch (Exception e1) {
             Assert.fail();
         }
     }
 
-    public TreeReader createXmlParser(){
+    public TreeReader createXmlParser() {
         try {
             parser = new XmlParser(inputStream);
             return parser;
@@ -681,7 +681,8 @@ public class XmlImportUtilitiesTests extends RefineTest {
             return null;
         }
     }
-    public TreeReader createJsonParser(){
+
+    public TreeReader createJsonParser() {
         parser = new JSONTreeReader(inputStream);
         return parser;
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java
index 2b6db9952..b0cbf4ac7 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java
@@ -57,7 +57,6 @@ import com.google.refine.model.Row;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 
-
 public class XmlImporterTests extends ImporterTest {
 
     @Override
@@ -65,16 +64,16 @@ public class XmlImporterTests extends ImporterTest {
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
-    //dependencies
+
+    // dependencies
     ByteArrayInputStream inputStream = null;
 
-    //System Under Test
+    // System Under Test
     XmlImporter SUT = null;
-    
+
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
         SUT = new XmlImporter();
     }
@@ -95,7 +94,7 @@ public class XmlImporterTests extends ImporterTest {
     }
 
     @Test
-    public void canParseSample(){
+    public void canParseSample() {
         RunTest(getSample());
 
         assertProjectCreated(project, 4, 6);
@@ -105,9 +104,9 @@ public class XmlImporterTests extends ImporterTest {
         Assert.assertNotNull(row.getCell(1));
         Assert.assertEquals(row.getCell(1).value, "Author 1, The");
     }
-    
+
     @Test
-    public void canParseDeeplyNestedSample(){
+    public void canParseDeeplyNestedSample() {
         RunTest(getDeeplyNestedSample(), getNestedOptions(job, SUT));
 
         assertProjectCreated(project, 4, 6);
@@ -117,32 +116,32 @@ public class XmlImporterTests extends ImporterTest {
         Assert.assertNotNull(row.getCell(1));
         Assert.assertEquals(row.getCell(1).value, "Author 1, The");
     }
-    
+
     @Test
-    public void canParseSampleWithMixedElement(){
+    public void canParseSampleWithMixedElement() {
         RunTest(getMixedElementSample(), getNestedOptions(job, SUT));
 
         assertProjectCreated(project, 4, 6);
-        
+
         Row row = project.rows.get(0);
         Assert.assertNotNull(row);
         Assert.assertNotNull(row.getCell(1));
         Assert.assertEquals(row.getCell(1).value, "Author 1, The");
     }
-    
+
     @Test
     public void ignoresDtds() {
-    	RunTest(getSampleWithDtd());
-    	
-    	assertProjectCreated(project, 4, 6);
-    	Row row = project.rows.get(0);
+        RunTest(getSampleWithDtd());
+
+        assertProjectCreated(project, 4, 6);
+        Row row = project.rows.get(0);
         Assert.assertNotNull(row);
         Assert.assertNotNull(row.getCell(1));
         Assert.assertEquals(row.getCell(1).value, "Author 1, The");
     }
 
     @Test
-    public void canParseSampleWithDuplicateNestedElements(){
+    public void canParseSampleWithDuplicateNestedElements() {
         RunTest(getSampleWithDuplicateNestedElements());
 
         assertProjectCreated(project, 4, 12);
@@ -156,7 +155,7 @@ public class XmlImporterTests extends ImporterTest {
     }
 
     @Test
-    public void testCanParseLineBreak(){
+    public void testCanParseLineBreak() {
 
         RunTest(getSampleWithLineBreak());
 
@@ -170,7 +169,7 @@ public class XmlImporterTests extends ImporterTest {
     }
 
     @Test
-    public void testElementsWithVaryingStructure(){
+    public void testElementsWithVaryingStructure() {
         RunTest(getSampleWithVaryingStructure());
 
         assertProjectCreated(project, 5, 6);
@@ -179,26 +178,26 @@ public class XmlImporterTests extends ImporterTest {
 
         Row row0 = project.rows.get(0);
         Assert.assertNotNull(row0);
-        Assert.assertEquals(row0.cells.size(),4);
+        Assert.assertEquals(row0.cells.size(), 4);
 
-        Row row5  = project.rows.get(5);
+        Row row5 = project.rows.get(5);
         Assert.assertNotNull(row5);
-        Assert.assertEquals(row5.cells.size(),5);
+        Assert.assertEquals(row5.cells.size(), 5);
     }
 
     @Test
-    public void testElementWithNestedTree(){
+    public void testElementWithNestedTree() {
         RunTest(getSampleWithTreeStructure());
 
         assertProjectCreated(project, 5, 6);
 
-        Assert.assertEquals(project.columnModel.columnGroups.size(),1);
+        Assert.assertEquals(project.columnModel.columnGroups.size(), 1);
         ColumnGroup cg0 = project.columnModel.columnGroups.get(0);
         Assert.assertEquals(cg0.keyColumnIndex, 1);
         Assert.assertEquals(cg0.startColumnIndex, 1);
         Assert.assertNull(cg0.parentGroup);
-        Assert.assertEquals(cg0.subgroups.size(),0);
-        Assert.assertEquals(cg0.columnSpan,2);
+        Assert.assertEquals(cg0.subgroups.size(), 0);
+        Assert.assertEquals(cg0.columnSpan, 2);
     }
 
     @Test
@@ -208,7 +207,8 @@ public class XmlImporterTests extends ImporterTest {
         // File is assumed to be in job.getRawDataDir(), so copy it there
         FileUtils.copyFile(new File(filename), new File(job.getRawDataDir(), FILE));
         List<ObjectNode> fileRecords = new ArrayList<>();
-        fileRecords.add(ParsingUtilities.evaluateJsonStringToObjectNode(String.format("{\"location\": \"%s\",\"fileName\": \"%s\"}", FILE, "xml-sample-format-1.xml")));
+        fileRecords.add(ParsingUtilities.evaluateJsonStringToObjectNode(
+                String.format("{\"location\": \"%s\",\"fileName\": \"%s\"}", FILE, "xml-sample-format-1.xml")));
 
         ObjectNode options = SUT.createParserUIInitializationData(
                 job, new LinkedList<>(), "text/json");
@@ -218,7 +218,7 @@ public class XmlImporterTests extends ImporterTest {
         JSONUtilities.safePut(options, "trimStrings", false);
         JSONUtilities.safePut(options, "storeEmptyStrings", true);
         JSONUtilities.safePut(options, "guessCellValueTypes", false);
-        JSONUtilities.safePut(options,"includeFileSources",true);
+        JSONUtilities.safePut(options, "includeFileSources", true);
 
         List<Exception> exceptions = new ArrayList<Exception>();
 
@@ -230,52 +230,51 @@ public class XmlImporterTests extends ImporterTest {
                 "text/json",
                 -1,
                 options,
-                exceptions
-        );
+                exceptions);
         Assert.assertNotNull(project.columnModel.getColumnByName("File"));
-        Assert.assertEquals(project.rows.get(0).getCell(0).value,"xml-sample-format-1.xml");
+        Assert.assertEquals(project.rows.get(0).getCell(0).value, "xml-sample-format-1.xml");
     }
 
-    //------------helper methods---------------
+    // ------------helper methods---------------
 
-    public static String getTypicalElement(int id){
+    public static String getTypicalElement(int id) {
         return "<book id=\"" + id + "\">" +
-        "<author>Author " + id + ", The</author>" +
-        "<title>Book title " + id + "</title>" +
-        "<publish_date>2010-05-26</publish_date>" +
-        "</book>";
+                "<author>Author " + id + ", The</author>" +
+                "<title>Book title " + id + "</title>" +
+                "<publish_date>2010-05-26</publish_date>" +
+                "</book>";
     }
 
-    public static String getElementWithDuplicateSubElement(int id){
+    public static String getElementWithDuplicateSubElement(int id) {
         return "<book id=\"" + id + "\">" +
-        "<authors>" +
-        "<author>Author " + id + ", The</author>" +
-        "<author>Author " + id + ", Another</author>" +
-        "</authors>" +
-        "<title>Book title " + id + "</title>" +
-        "<publish_date>2010-05-26</publish_date>" +
-        "</book>";
+                "<authors>" +
+                "<author>Author " + id + ", The</author>" +
+                "<author>Author " + id + ", Another</author>" +
+                "</authors>" +
+                "<title>Book title " + id + "</title>" +
+                "<publish_date>2010-05-26</publish_date>" +
+                "</book>";
     }
 
-    public static String getSample(){
+    public static String getSample() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?><library>");
-        for(int i = 1; i < 7; i++){
+        for (int i = 1; i < 7; i++) {
             sb.append(getTypicalElement(i));
         }
         sb.append("</library>");
         return sb.toString();
     }
-    
-    public static String getSampleWithDtd(){
+
+    public static String getSampleWithDtd() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?>");
-        sb.append("<!DOCTYPE library [\n" + 
-    			"<!ENTITY % asd SYSTEM \"http://domain.does.not.exist:4444/ext.dtd\">\n" + 
-    			"%asd;\n" + 
-    			"%c;\n" + 
-    			"]><library>");
-        for(int i = 1; i < 7; i++){
+        sb.append("<!DOCTYPE library [\n" +
+                "<!ENTITY % asd SYSTEM \"http://domain.does.not.exist:4444/ext.dtd\">\n" +
+                "%asd;\n" +
+                "%c;\n" +
+                "]><library>");
+        for (int i = 1; i < 7; i++) {
             sb.append(getTypicalElement(i));
         }
         sb.append("</library>");
@@ -285,46 +284,33 @@ public class XmlImporterTests extends ImporterTest {
     public static ObjectNode getOptions(ImportingJob job, TreeImportingParserBase parser) {
         ObjectNode options = parser.createParserUIInitializationData(
                 job, Collections.emptyList(), "text/xml");
-        
+
         ArrayNode path = ParsingUtilities.mapper.createArrayNode();
         JSONUtilities.append(path, "library");
         JSONUtilities.append(path, "book");
-        
+
         JSONUtilities.safePut(options, "recordPath", path);
         return options;
     }
-    
+
     public static ObjectNode getNestedOptions(ImportingJob job, TreeImportingParserBase parser) {
         ObjectNode options = parser.createParserUIInitializationData(
                 job, Collections.emptyList(), "text/xml");
-        
+
         ArrayNode path = ParsingUtilities.mapper.createArrayNode();
         JSONUtilities.append(path, "nest");
         JSONUtilities.append(path, "nest2");
         JSONUtilities.append(path, "library");
         JSONUtilities.append(path, "book");
-        
+
         JSONUtilities.safePut(options, "recordPath", path);
         return options;
     }
-    
-    public static String getDeeplyNestedSample(){
+
+    public static String getDeeplyNestedSample() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?><nest><nest2><library>");
-        for(int i = 1; i < 7; i++){
-            sb.append(getTypicalElement(i));
-        }
-        sb.append("</library></nest2>");
-        sb.append("<anElement>asdf</anElement></nest>");
-        return sb.toString();
-    }
-    
-    public static String getMixedElementSample(){
-        StringBuilder sb = new StringBuilder();
-        sb.append("<?xml version=\"1.0\"?><nest>");
-        sb.append("somemixeduptext");
-        sb.append("<nest2><library>");
-        for(int i = 1; i < 7; i++){
+        for (int i = 1; i < 7; i++) {
             sb.append(getTypicalElement(i));
         }
         sb.append("</library></nest2>");
@@ -332,10 +318,23 @@ public class XmlImporterTests extends ImporterTest {
         return sb.toString();
     }
 
-    public static String getSampleWithDuplicateNestedElements(){
+    public static String getMixedElementSample() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<?xml version=\"1.0\"?><nest>");
+        sb.append("somemixeduptext");
+        sb.append("<nest2><library>");
+        for (int i = 1; i < 7; i++) {
+            sb.append(getTypicalElement(i));
+        }
+        sb.append("</library></nest2>");
+        sb.append("<anElement>asdf</anElement></nest>");
+        return sb.toString();
+    }
+
+    public static String getSampleWithDuplicateNestedElements() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?><library>");
-        for(int i = 1; i < 7; i++){
+        for (int i = 1; i < 7; i++) {
             sb.append(getElementWithDuplicateSubElement(i));
         }
         sb.append("</library>");
@@ -343,10 +342,10 @@ public class XmlImporterTests extends ImporterTest {
 
     }
 
-    public static String getSampleWithLineBreak(){
+    public static String getSampleWithLineBreak() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?><library>");
-        for(int i = 1; i < 4; i++){
+        for (int i = 1; i < 4; i++) {
             sb.append(getTypicalElement(i));
         }
         sb.append("<book id=\"4\">" +
@@ -360,10 +359,10 @@ public class XmlImporterTests extends ImporterTest {
         return sb.toString();
     }
 
-    public static String getSampleWithVaryingStructure(){
+    public static String getSampleWithVaryingStructure() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?><library>");
-        for(int i = 1; i < 6; i++){
+        for (int i = 1; i < 6; i++) {
             sb.append(getTypicalElement(i));
         }
         sb.append("<book id=\"6\">" +
@@ -376,10 +375,10 @@ public class XmlImporterTests extends ImporterTest {
         return sb.toString();
     }
 
-    public static String getSampleWithTreeStructure(){
+    public static String getSampleWithTreeStructure() {
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version=\"1.0\"?><library>");
-        for(int i = 1; i < 7; i++){
+        for (int i = 1; i < 7; i++) {
             sb.append("<book id=\"" + i + "\">" +
                     "<author><author-name>Author " + i + ", The</author-name>" +
                     "<author-dob>1950-0" + i + "-15</author-dob></author>" +
@@ -391,13 +390,13 @@ public class XmlImporterTests extends ImporterTest {
         return sb.toString();
     }
 
-    private void RunTest(String testString){
+    private void RunTest(String testString) {
         RunTest(testString, getOptions(job, SUT));
     }
-    
+
     private void RunTest(String testString, ObjectNode objectNode) {
         try {
-            inputStream = new ByteArrayInputStream(testString.getBytes( "UTF-8" ));
+            inputStream = new ByteArrayInputStream(testString.getBytes("UTF-8"));
         } catch (UnsupportedEncodingException e1) {
             Assert.fail();
         }
@@ -409,7 +408,7 @@ public class XmlImporterTests extends ImporterTest {
             Assert.fail();
         }
     }
-    
+
     @Override
     protected void parseOneFile(TreeImportingParserBase parser, InputStream inputStream, ObjectNode options) {
         parseOneInputStream(parser, inputStream, options);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java
index 64d5f344e..73d60f011 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.importing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingManagerTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingManagerTests.java
index c5fdf8a1f..324b9dbac 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingManagerTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingManagerTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.importing;
 
 import static org.testng.Assert.assertEquals;
@@ -37,11 +38,10 @@ public class ImportingManagerTests extends ImporterTest {
 
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
     }
 
-
     @Test
     public void testStructuredNameSuffixFallback() {
         ImportingManager.registerMimeType("+json", "text/json");
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java
index 086eda0e3..2777af120 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.importing;
 
 import static org.mockito.Mockito.mock;
@@ -74,10 +75,10 @@ public class ImportingUtilitiesTests extends ImporterTest {
 
     @Override
     @BeforeMethod
-    public void setUp(){
+    public void setUp() {
         super.setUp();
     }
-    
+
     @Test
     public void createProjectMetadataTest()
             throws Exception {
@@ -89,13 +90,13 @@ public class ImportingUtilitiesTests extends ImporterTest {
         Assert.assertTrue(pm.getTags().length == 0);
     }
 
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void testZipSlip() throws IOException {
         File tempDir = TestUtils.createTempDirectory("openrefine-zip-slip-test");
         // For CVE-2018-19859, issue #1840
         ImportingUtilities.allocateFile(tempDir, "../../tmp/script.sh");
     }
-    
+
     @Test
     public void testAllocateFileDeduplication() throws IOException {
         // Test for comment https://github.com/OpenRefine/OpenRefine/issues/3043#issuecomment-671057317
@@ -104,7 +105,7 @@ public class ImportingUtilitiesTests extends ImporterTest {
         dirA.mkdir();
         File conflicting = new File(dirA, "dummy");
         conflicting.createNewFile();
-        
+
         File allocated = ImportingUtilities.allocateFile(dirA, ".././a/dummy");
         Assert.assertEquals(allocated, new File(dirA, "dummy-2"));
     }
@@ -140,26 +141,27 @@ public class ImportingUtilitiesTests extends ImporterTest {
         when(req.getContentLength()).thenReturn((int) entity.getContentLength());
         when(req.getInputStream()).thenReturn(new MockServletInputStream(is));
 
-
         ImportingJob job = ImportingManager.createJob();
         Properties parameters = ParsingUtilities.parseUrlParameters(req);
         ObjectNode retrievalRecord = ParsingUtilities.mapper.createObjectNode();
         ObjectNode progress = ParsingUtilities.mapper.createObjectNode();
         try {
-            ImportingUtilities.retrieveContentFromPostRequest(req, parameters, job.getRawDataDir(), retrievalRecord, new ImportingUtilities.Progress() {
-                @Override
-                public void setProgress(String message, int percent) {
-                    if (message != null) {
-                        JSONUtilities.safePut(progress, "message", message);
-                    }
-                    JSONUtilities.safePut(progress, "percent", percent);
-                }
+            ImportingUtilities.retrieveContentFromPostRequest(req, parameters, job.getRawDataDir(), retrievalRecord,
+                    new ImportingUtilities.Progress() {
 
-                @Override
-                public boolean isCanceled() {
-                    return job.canceled;
-                }
-            });
+                        @Override
+                        public void setProgress(String message, int percent) {
+                            if (message != null) {
+                                JSONUtilities.safePut(progress, "message", message);
+                            }
+                            JSONUtilities.safePut(progress, "percent", percent);
+                        }
+
+                        @Override
+                        public boolean isCanceled() {
+                            return job.canceled;
+                        }
+                    });
             fail("No Exception was thrown");
         } catch (Exception exception) {
             assertEquals(exception.getMessage(), MESSAGE);
@@ -181,36 +183,34 @@ public class ImportingUtilitiesTests extends ImporterTest {
             return delegate.read();
         }
 
-		@Override
-		public boolean isFinished() {
-			return false;
-		}
+        @Override
+        public boolean isFinished() {
+            return false;
+        }
 
-		@Override
-		public boolean isReady() {
-			return true;
-		}
+        @Override
+        public boolean isReady() {
+            return true;
+        }
 
-		@Override
-		public void setReadListener(ReadListener readListener) {
-			
-		}
+        @Override
+        public void setReadListener(ReadListener readListener) {
+
+        }
 
     }
 
     /**
-     * This tests both exploding a zip archive into it's constituent files
-     * as well as importing them all (both) and making sure that the
-     * recording of archive names and file names works correctly.
+     * This tests both exploding a zip archive into it's constituent files as well as importing them all (both) and
+     * making sure that the recording of archive names and file names works correctly.
      *
-     * It's kind of a lot to have in one test, but it's a sequence
-     * of steps that need to be done in order.
+     * It's kind of a lot to have in one test, but it's a sequence of steps that need to be done in order.
      *
      * @throws IOException
      */
     @SuppressWarnings("unchecked")
     @Test
-    public void importArchive() throws IOException{
+    public void importArchive() throws IOException {
         String filename = "movies.zip";
         String filepath = ClassLoader.getSystemResource(filename).getPath();
         // Make a copy in our data directory where it's expected
@@ -219,8 +219,10 @@ public class ImportingUtilitiesTests extends ImporterTest {
         FileUtils.copyFile(new File(filepath), tmp);
 
         Progress dummyProgress = new Progress() {
+
             @Override
-            public void setProgress(String message, int percent) {}
+            public void setProgress(String message, int percent) {
+            }
 
             @Override
             public boolean isCanceled() {
@@ -256,36 +258,35 @@ public class ImportingUtilitiesTests extends ImporterTest {
                 "tsv",
                 -1,
                 options,
-                exceptions
-                );
+                exceptions);
         assertEquals(exceptions.size(), 0);
         project.update();
 
-        assertEquals(project.columnModel.columns.get(0).getName(),"Archive");
-        assertEquals(project.rows.get(0).getCell(0).getValue(),"movies.zip");
-        assertEquals(project.columnModel.columns.get(1).getName(),"File");
-        assertEquals(project.rows.get(0).getCell(1).getValue(),"movies-condensed.tsv");
-        assertEquals(project.columnModel.columns.get(2).getName(),"name");
-        assertEquals(project.rows.get(0).getCell(2).getValue(),"Wayne's World");
+        assertEquals(project.columnModel.columns.get(0).getName(), "Archive");
+        assertEquals(project.rows.get(0).getCell(0).getValue(), "movies.zip");
+        assertEquals(project.columnModel.columns.get(1).getName(), "File");
+        assertEquals(project.rows.get(0).getCell(1).getValue(), "movies-condensed.tsv");
+        assertEquals(project.columnModel.columns.get(2).getName(), "name");
+        assertEquals(project.rows.get(0).getCell(2).getValue(), "Wayne's World");
 
         // Make sure we imported both files contained in the zip file
         assertEquals(project.rows.size(), 252);
 
         ArrayNode importOptionsArray = metadata.getImportOptionMetadata();
         assertEquals(importOptionsArray.size(), 2);
-        ObjectNode importOptions = (ObjectNode)importOptionsArray.get(0);
+        ObjectNode importOptions = (ObjectNode) importOptionsArray.get(0);
         assertEquals(importOptions.get("archiveFileName").asText(), "movies.zip");
         assertEquals(importOptions.get("fileSource").asText(), "movies-condensed.tsv");
         assertTrue(importOptions.get("includeFileSources").asBoolean());
         assertTrue(importOptions.get("includeArchiveFileName").asBoolean());
 
-        importOptions = (ObjectNode)importOptionsArray.get(1);
+        importOptions = (ObjectNode) importOptionsArray.get(1);
         assertEquals(importOptions.get("fileSource").asText(), "movies.tsv");
         assertEquals(importOptions.get("archiveFileName").asText(), "movies.zip");
     }
 
     @Test
-    public void importUnsupportedZipFile() throws IOException{
+    public void importUnsupportedZipFile() throws IOException {
         String filename = "unsupportedPPMD.zip";
         String filepath = ClassLoader.getSystemResource(filename).getPath();
         // Make a copy in our data directory where it's expected
@@ -294,8 +295,10 @@ public class ImportingUtilitiesTests extends ImporterTest {
         FileUtils.copyFile(new File(filepath), tmp);
 
         Progress dummyProgress = new Progress() {
+
             @Override
-            public void setProgress(String message, int percent) {}
+            public void setProgress(String message, int percent) {
+            }
 
             @Override
             public boolean isCanceled() {
@@ -314,9 +317,12 @@ public class ImportingUtilitiesTests extends ImporterTest {
         HttpServletRequest request = mock(HttpServletRequest.class);
         HttpServletResponse response = mock(HttpServletResponse.class);
 
-        assertThrows(IOException.class, () -> ImportingUtilities.postProcessRetrievedFile(job.getRawDataDir(), tmp, fileRecord, fileRecords, dummyProgress));
-        assertThrows(FileUploadBase.InvalidContentTypeException.class, () -> ImportingUtilities.retrieveContentFromPostRequest(request, new Properties(), job.getRawDataDir(), fileRecord, dummyProgress));
-        assertThrows(IOException.class, () -> ImportingUtilities.loadDataAndPrepareJob(request, response, new Properties(), job, fileRecord));
+        assertThrows(IOException.class,
+                () -> ImportingUtilities.postProcessRetrievedFile(job.getRawDataDir(), tmp, fileRecord, fileRecords, dummyProgress));
+        assertThrows(FileUploadBase.InvalidContentTypeException.class, () -> ImportingUtilities.retrieveContentFromPostRequest(request,
+                new Properties(), job.getRawDataDir(), fileRecord, dummyProgress));
+        assertThrows(IOException.class,
+                () -> ImportingUtilities.loadDataAndPrepareJob(request, response, new Properties(), job, fileRecord));
 
     }
 
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java b/OpenRefine/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java
index af89c4f0c..3a240251c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.io;
 
 import static org.mockito.Mockito.mock;
@@ -38,14 +39,15 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 import com.google.refine.ProjectMetadata;
 
-public class FileProjectManagerTests  {
+public class FileProjectManagerTests {
+
     protected File workspaceDir;
-    
+
     @BeforeMethod
     public void createDirectory() throws IOException {
         workspaceDir = TestUtils.createTempDirectory("openrefine-test-workspace-dir");
     }
-    
+
     protected class FileProjectManagerStub extends FileProjectManager {
 
         protected FileProjectManagerStub(File dir) {
@@ -53,25 +55,25 @@ public class FileProjectManagerTests  {
             _projectsMetadata.put(5555L, mock(ProjectMetadata.class));
         }
     }
-    
+
     @Test
     public void serializeFileProjectManager() {
         FileProjectManager manager = new FileProjectManagerStub(workspaceDir);
-        String json = "{\n" + 
-                "       \"preferences\" : {\n" + 
-                "         \"entries\" : {\n" + 
-                "           \"scripting.expressions\" : {\n" + 
-                "             \"class\" : \"com.google.refine.preference.TopList\",\n" + 
-                "             \"list\" : [ ],\n" + 
-                "             \"top\" : 100\n" + 
-                "           },\n" + 
-                "           \"scripting.starred-expressions\" : {\n" + 
-                "             \"class\" : \"com.google.refine.preference.TopList\",\n" + 
-                "             \"list\" : [ ],\n" + 
-                "             \"top\" : 2147483647\n" + 
+        String json = "{\n" +
+                "       \"preferences\" : {\n" +
+                "         \"entries\" : {\n" +
+                "           \"scripting.expressions\" : {\n" +
+                "             \"class\" : \"com.google.refine.preference.TopList\",\n" +
+                "             \"list\" : [ ],\n" +
+                "             \"top\" : 100\n" +
+                "           },\n" +
+                "           \"scripting.starred-expressions\" : {\n" +
+                "             \"class\" : \"com.google.refine.preference.TopList\",\n" +
+                "             \"list\" : [ ],\n" +
+                "             \"top\" : 2147483647\n" +
                 "           }\n" +
-                "         }\n" + 
-                "       },\n" + 
+                "         }\n" +
+                "       },\n" +
                 "       \"projectIDs\" : [ 5555 ]\n" +
                 "     }";
         TestUtils.isSerializedTo(manager, json);
@@ -79,17 +81,15 @@ public class FileProjectManagerTests  {
     }
 
     /**
-     * Test that we can save and restore non-ASCII characters.
-     * For best effectiveness, this should be run with a non-UTF8
-     * default encoding for Java e.g. java -Dfile.encoding=cp1252
-     * to simulate running on a Windows system
+     * Test that we can save and restore non-ASCII characters. For best effectiveness, this should be run with a
+     * non-UTF8 default encoding for Java e.g. java -Dfile.encoding=cp1252 to simulate running on a Windows system
      */
     @Test
-    public void saveReloadMultinationalCharacter () throws IOException {
+    public void saveReloadMultinationalCharacter() throws IOException {
         FileProjectManager manager = new FileProjectManagerStub(workspaceDir);
         manager.getPreferenceStore().put("testPref", "Refiné");
         manager.saveWorkspace();
         manager = new FileProjectManagerStub(workspaceDir);
         assertEquals(manager.getPreferenceStore().get("testPref"), "Refiné");
-        }
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/io/ProjectMetadataTests.java b/OpenRefine/main/tests/server/src/com/google/refine/io/ProjectMetadataTests.java
index f9edbb8bd..a74a5e4d3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/io/ProjectMetadataTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/io/ProjectMetadataTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.io;
 
 import java.io.IOException;
@@ -47,18 +48,18 @@ public class ProjectMetadataTests {
 
     @BeforeSuite
     public void setUpJson() throws IOException {
-    	InputStream f = ProjectMetadataTests.class.getClassLoader().getResourceAsStream("example_project_metadata.json");
-		jsonNonSaveMode = IOUtils.toString(f);
-		f = ProjectMetadataTests.class.getClassLoader().getResourceAsStream("example_project_metadata_save_mode.json");
-		jsonSaveMode = IOUtils.toString(f);
+        InputStream f = ProjectMetadataTests.class.getClassLoader().getResourceAsStream("example_project_metadata.json");
+        jsonNonSaveMode = IOUtils.toString(f);
+        f = ProjectMetadataTests.class.getClassLoader().getResourceAsStream("example_project_metadata_save_mode.json");
+        jsonSaveMode = IOUtils.toString(f);
     }
-	
-	@Test
-	public void serializeProjectMetadata() throws IOException {
+
+    @Test
+    public void serializeProjectMetadata() throws IOException {
         ProjectMetadata metadata = ParsingUtilities.mapper.readValue(jsonSaveMode, ProjectMetadata.class);
         TestUtils.isSerializedTo(metadata, jsonNonSaveMode);
         TestUtils.isSerializedTo(metadata, jsonSaveMode, true);
-	}
+    }
 
     @Test
     public void serializeProjectMetadataInDifferentTimezone() throws JsonParseException, JsonMappingException, IOException {
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/CacheTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/CacheTests.java
index 9996815be..83e1b4887 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/CacheTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/CacheTests.java
@@ -52,9 +52,8 @@ import com.google.refine.grel.Function;
 import com.google.refine.operations.EngineDependentOperation;
 import com.google.refine.operations.row.RowRemovalOperation;
 
-
 public class CacheTests extends RefineTest {
-    
+
     // Equivalent to duplicate facet on Column A with true selected
     static final String ENGINE_JSON_DUPLICATES = "{\"facets\":[{\"type\":\"list\",\"name\":\"facet A\",\"columnName\":\"Column A\",\"expression\":\"facetCount(value, 'value', 'Column A') > 1\",\"omitBlank\":false,\"omitError\":false,\"selection\":[{\"v\":{\"v\":true,\"l\":\"true\"}}],\"selectBlank\":false,\"selectError\":false,\"invert\":false}],\"mode\":\"row-based\"}}";
 
@@ -74,15 +73,15 @@ public class CacheTests extends RefineTest {
     @BeforeMethod
     public void SetUp() throws IOException, ModelException {
         project = createProjectWithColumns("CacheTests", "Column A");
-        
+
         engine = new Engine(project);
         engine_config = EngineConfig.reconstruct(ENGINE_JSON_DUPLICATES);
         engine.initializeFromConfig(engine_config);
         engine.setMode(Engine.Mode.RowBased);
-        
+
         bindings = new Properties();
         bindings.put("project", project);
-        
+
     }
 
     @AfterMethod
@@ -93,9 +92,8 @@ public class CacheTests extends RefineTest {
     }
 
     /**
-     * Test for issue 567.  Problem doesn't seem to occur when testing
-     * interactively, but this demonstrates that the facet count cache
-     * can get stale after row removal operations
+     * Test for issue 567. Problem doesn't seem to occur when testing interactively, but this demonstrates that the
+     * facet count cache can get stale after row removal operations
      * 
      * @throws Exception
      */
@@ -103,22 +101,22 @@ public class CacheTests extends RefineTest {
     public void testIssue567() throws Exception {
         for (int i = 0; i < 5; i++) {
             Row row = new Row(5);
-            row.setCell(0, new Cell(i < 4 ? "a":"b", null));
+            row.setCell(0, new Cell(i < 4 ? "a" : "b", null));
             project.rows.add(row);
         }
-        engine.getAllRows().accept(project, new CountingRowVisitor(5)) ;
+        engine.getAllRows().accept(project, new CountingRowVisitor(5));
         engine.getAllFilteredRows().accept(project, new CountingRowVisitor(4));
         Function fc = new FacetCount();
-        Integer count = (Integer) fc.call(bindings, new Object[] {"a", "value", "Column A"});
+        Integer count = (Integer) fc.call(bindings, new Object[] { "a", "value", "Column A" });
         Assert.assertEquals(count.intValue(), 4);
         EngineDependentOperation op = new RowRemovalOperation(engine_config);
         op.createProcess(project, options).performImmediate();
-        engine.getAllRows().accept(project, new CountingRowVisitor(1)) ;
+        engine.getAllRows().accept(project, new CountingRowVisitor(1));
         engine.getAllFilteredRows().accept(project, new CountingRowVisitor(0));
-        count = (Integer) fc.call(bindings, new Object[] {"a", "value", "Column A"});
+        count = (Integer) fc.call(bindings, new Object[] { "a", "value", "Column A" });
         Assert.assertEquals(count.intValue(), 0);
     }
-    
+
     class CountingRowVisitor implements RowVisitor {
 
         private int count = 0;
@@ -136,12 +134,12 @@ public class CacheTests extends RefineTest {
 
         @Override
         public void start(Project project) {
-            count = 0; 
+            count = 0;
         }
 
         @Override
         public void end(Project project) {
-            Assert.assertEquals(count, target); 
+            Assert.assertEquals(count, target);
         }
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/CellTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/CellTests.java
index 26c9d0f5d..faa160f68 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/CellTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/CellTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import java.time.format.DateTimeFormatter;
@@ -42,7 +43,7 @@ import com.google.refine.util.Pool;
 import com.google.refine.util.TestUtils;
 
 public class CellTests {
-    
+
     String reconJson = "{\"id\":1533649346002675326,"
             + "\"judgmentHistoryEntry\":1530278634724,"
             + "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
@@ -52,48 +53,48 @@ public class CellTests {
             + "\"m\":{\"id\":\"Q551479\",\"name\":\"La Monnaie\",\"score\":100,\"types\":[\"Q153562\"]},"
             + "\"c\":[{\"id\":\"Q551479\",\"name\":\"La Monnaie\",\"score\":100,\"types\":[\"Q153562\"]}],"
             + "\"f\":[false,false,34,0],\"judgmentAction\":\"auto\",\"judgmentBatchSize\":1,\"matchRank\":0}";
-    
+
     Pool pool = mock(Pool.class);
     Recon recon = null;
-    
+
     @Test
     public void serializeCellWithRecon() throws Exception {
         recon = Recon.loadStreaming(reconJson);
         when(pool.getRecon("1533649346002675326")).thenReturn(recon);
         String json = "{\"v\":\"http://www.wikidata.org/entity/Q41522540\",\"r\":\"1533649346002675326\"}";
-        
+
         Cell c = Cell.loadStreaming(json, pool);
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeCellWithString() throws Exception {
         String json = "{\"v\":\"0000-0002-5022-0488\"}";
         Cell c = Cell.loadStreaming(json, pool);
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeNullCell() throws Exception {
         String json = "null";
         Cell c = Cell.loadStreaming(json, pool);
         assertNull(c);
     }
-    
+
     @Test
     public void serializeEmptyStringCell() throws Exception {
         String json = "{\"v\":\"\"}";
         Cell c = Cell.loadStreaming(json, pool);
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeErrorCell() throws Exception {
         String json = "{\"e\":\"HTTP 403\"}";
         Cell c = Cell.loadStreaming(json, pool);
         TestUtils.isSerializedTo(c, json);
     }
-	
+
     @Test
     public void getMessageFromErrorCell() throws Exception {
         String errorMessage = "Sample error message";
@@ -115,14 +116,14 @@ public class CellTests {
         Cell c = Cell.loadStreaming(json, pool);
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeBooleanCell() throws Exception {
         String json = "{\"v\": true}";
         Cell c = Cell.loadStreaming(json, pool);
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeDatewithOffset() throws Exception {
         OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+01:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
@@ -130,15 +131,15 @@ public class CellTests {
         String json = "{\"v\":\"2017-05-12T04:45:00Z\",\"t\":\"date\"}";
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeLocalDate() throws Exception {
-        LocalDateTime dateTimeValue = LocalDateTime.of(2017,5,12,0,0,0);
+        LocalDateTime dateTimeValue = LocalDateTime.of(2017, 5, 12, 0, 0, 0);
         Cell c = new Cell(dateTimeValue, null);
         String json = "{\"v\":\"2017-05-12T00:00:00Z\",\"t\":\"date\"}";
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeDoubleNan() throws Exception {
         double dn = Double.NaN;
@@ -146,7 +147,7 @@ public class CellTests {
         String json = "{\"v\":\"NaN\"}";
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeFloatNan() throws Exception {
         Float fn = Float.NaN;
@@ -154,7 +155,7 @@ public class CellTests {
         String json = "{\"v\":\"NaN\"}";
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeDoubleInfinity() throws Exception {
         double di = Double.POSITIVE_INFINITY;
@@ -162,7 +163,7 @@ public class CellTests {
         String json = "{\"v\":\"Infinity\"}";
         TestUtils.isSerializedTo(c, json);
     }
-    
+
     @Test
     public void serializeFloatInfinity() throws Exception {
         Float fi = Float.POSITIVE_INFINITY;
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnGroupTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnGroupTests.java
index a1ddf355b..a8375ec2a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnGroupTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnGroupTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import org.testng.annotations.Test;
@@ -31,21 +32,22 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ColumnGroupTests {
-    
+
     String json = "{"
             + "\"startColumnIndex\":2,"
             + "\"columnSpan\":3,"
             + "\"keyColumnIndex\":1"
             + "}";
+
     @Test
     public void serializeColumnGroup() throws Exception {
         TestUtils.isSerializedTo(ColumnGroup.load(json), json);
     }
-    
+
     @Test
     public void serializeColumnGroupWithSubgroups() throws Exception {
-        ColumnGroup cg = new ColumnGroup(2,3,1);
-        ColumnGroup subCg = new ColumnGroup(2,2,1);
+        ColumnGroup cg = new ColumnGroup(2, 3, 1);
+        ColumnGroup subCg = new ColumnGroup(2, 2, 1);
         cg.subgroups.add(subCg);
         String fullJson = "{"
                 + "\"startColumnIndex\":2,"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnModelTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnModelTests.java
index 24315fbc9..23f232a7d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnModelTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnModelTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import org.testng.annotations.Test;
@@ -32,37 +33,38 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class ColumnModelTests extends RefineTest {
+
     @Test
     public void serializeColumnModel() {
-        Project project = createCSVProject("a,b\n"+ 
+        Project project = createCSVProject("a,b\n" +
                 "e,e");
-        String json = "{\n" + 
-                "       \"columnGroups\" : [ ],\n" + 
-                "       \"columns\" : [ {\n" + 
-                "         \"cellIndex\" : 0,\n" + 
-                "         \"constraints\" : \"{}\",\n" + 
-                "         \"description\" : \"\",\n" + 
-                "         \"format\" : \"default\",\n" + 
-                "         \"name\" : \"a\",\n" + 
-                "         \"originalName\" : \"a\",\n" + 
-                "         \"title\" : \"\",\n" + 
-                "         \"type\" : \"\"\n" + 
-                "       }, {\n" + 
-                "         \"cellIndex\" : 1,\n" + 
-                "         \"constraints\" : \"{}\",\n" + 
-                "         \"description\" : \"\",\n" + 
-                "         \"format\" : \"default\",\n" + 
-                "         \"name\" : \"b\",\n" + 
-                "         \"originalName\" : \"b\",\n" + 
-                "         \"title\" : \"\",\n" + 
-                "         \"type\" : \"\"\n" + 
-                "       } ],\n" + 
-                "       \"keyCellIndex\" : 0,\n" + 
-                "       \"keyColumnName\" : \"a\"\n" + 
+        String json = "{\n" +
+                "       \"columnGroups\" : [ ],\n" +
+                "       \"columns\" : [ {\n" +
+                "         \"cellIndex\" : 0,\n" +
+                "         \"constraints\" : \"{}\",\n" +
+                "         \"description\" : \"\",\n" +
+                "         \"format\" : \"default\",\n" +
+                "         \"name\" : \"a\",\n" +
+                "         \"originalName\" : \"a\",\n" +
+                "         \"title\" : \"\",\n" +
+                "         \"type\" : \"\"\n" +
+                "       }, {\n" +
+                "         \"cellIndex\" : 1,\n" +
+                "         \"constraints\" : \"{}\",\n" +
+                "         \"description\" : \"\",\n" +
+                "         \"format\" : \"default\",\n" +
+                "         \"name\" : \"b\",\n" +
+                "         \"originalName\" : \"b\",\n" +
+                "         \"title\" : \"\",\n" +
+                "         \"type\" : \"\"\n" +
+                "       } ],\n" +
+                "       \"keyCellIndex\" : 0,\n" +
+                "       \"keyColumnName\" : \"a\"\n" +
                 "     }";
         TestUtils.isSerializedTo(project.columnModel, json);
     }
-    
+
     @Test
     public void serializeColumnModelEmpty() {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnTests.java
index ae0c36089..d75234402 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ColumnTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import static org.mockito.Mockito.mock;
@@ -38,6 +39,7 @@ import com.google.refine.util.TestUtils;
 import edu.mit.simile.butterfly.ButterflyModule;
 
 public class ColumnTests {
+
     @Test
     public void serializeColumn() throws Exception {
         ButterflyModule core = mock(ButterflyModule.class);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ProjectStub.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ProjectStub.java
index 59ad12eba..f47d309a9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ProjectStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ProjectStub.java
@@ -33,9 +33,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.model;
 
-
 public class ProjectStub extends Project {
-    public ProjectStub(long id){
+
+    public ProjectStub(long id) {
         super(id);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconCandidateTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconCandidateTests.java
index af9a9c3d2..13003e8b9 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconCandidateTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconCandidateTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import org.testng.annotations.Test;
@@ -31,6 +32,7 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ReconCandidateTests {
+
     @Test
     public void serializeReconCandidateInt() throws Exception {
         String json = "{\"id\":\"Q49213\","
@@ -40,7 +42,7 @@ public class ReconCandidateTests {
         ReconCandidate rc = ReconCandidate.loadStreaming(json);
         TestUtils.isSerializedTo(rc, json);
     }
-    
+
     @Test
     public void serializeReconCandidateDouble() throws Exception {
         String json = "{\"id\":\"Q49213\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconStatsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconStatsTests.java
index a86efc3ba..aa394f297 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconStatsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconStatsTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import org.testng.annotations.Test;
@@ -31,10 +32,10 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ReconStatsTests {
-    
+
     @Test
     public void serializeReconStats() {
         ReconStats rs = new ReconStats(3, 1, 2);
-        TestUtils.isSerializedTo(rs,"{\"nonBlanks\":3,\"newTopics\":1,\"matchedTopics\":2}");
+        TestUtils.isSerializedTo(rs, "{\"nonBlanks\":3,\"newTopics\":1,\"matchedTopics\":2}");
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTests.java
index dc6979914..2da723af6 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import java.util.Set;
@@ -37,7 +38,7 @@ import com.google.refine.model.Recon.Judgment;
 import com.google.refine.util.TestUtils;
 
 public class ReconTests {
-    
+
     String fullJson = "{\"id\":1533651559492945033,"
             + "\"judgmentHistoryEntry\":1533651616890,"
             + "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
@@ -59,13 +60,13 @@ public class ReconTests {
             + "\"judgmentAction\":\"mass\","
             + "\"judgmentBatchSize\":1,"
             + "\"matchRank\":0}";
-    
+
     @Test
-    public void serializeReconSaveMode() throws Exception {      
+    public void serializeReconSaveMode() throws Exception {
         Recon r = Recon.loadStreaming(fullJson);
         TestUtils.isSerializedTo(r, fullJson, true);
     }
-        
+
     @Test
     public void serializeReconViewMode() throws Exception {
         Recon r = Recon.loadStreaming(fullJson);
@@ -82,7 +83,7 @@ public class ReconTests {
                 + "}}";
         TestUtils.isSerializedTo(r, shortJson, false);
     }
-    
+
     @Test
     public void serializeReconSaveModeNoMatch() throws Exception {
         String json = "{\"id\":1533651559492945033,"
@@ -101,11 +102,10 @@ public class ReconTests {
         r.judgment = Judgment.None;
         TestUtils.isSerializedTo(r, json);
     }
-    
+
     /**
-     * Test for issue https://github.com/OpenRefine/OpenRefine/issues/3785.
-     * Generating many recon objects within a short amount of time leads
-     * to collisions in id generation.
+     * Test for issue https://github.com/OpenRefine/OpenRefine/issues/3785. Generating many recon objects within a short
+     * amount of time leads to collisions in id generation.
      */
     @Test
     public void randomIdGeneration() {
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTypeTest.java b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTypeTest.java
index fccff93dd..b1db60658 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTypeTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/ReconTypeTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import java.io.IOException;
@@ -34,17 +35,18 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class ReconTypeTest {
+
     @Test
     public void serializeReconType() throws IOException {
         String json = "{\"id\":\"Q7540126\",\"name\":\"headquarters\"}";
         ReconType rt = ReconType.load(json);
         TestUtils.isSerializedTo(rt, json);
     }
-    
+
     @Test
     public void deserializeFromString() throws IOException {
-    	// reconciliation services can return lists of types as bare lists of strings
-    	ReconType rt = ReconType.load("\"Q7540126\"");
-    	Assert.assertEquals(rt.id, "Q7540126");
+        // reconciliation services can return lists of types as bare lists of strings
+        ReconType rt = ReconType.load("\"Q7540126\"");
+        Assert.assertEquals(rt.id, "Q7540126");
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/RecordModelTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/RecordModelTests.java
index b1af88718..e9d9d2155 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/RecordModelTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/RecordModelTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model;
 
 import org.testng.annotations.Test;
@@ -32,12 +33,12 @@ import com.google.refine.RefineTest;
 import com.google.refine.util.TestUtils;
 
 public class RecordModelTests extends RefineTest {
+
     @Test
     public void serializeRecordModel() {
         Project proj = createCSVProject("key,val\n"
                 + "34,first\n"
-                + ",second"
-                );
+                + ",second");
         TestUtils.isSerializedTo(proj.recordModel, "{\"hasRecords\":true}");
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/RowTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/RowTests.java
index 484d138a9..8337acd1b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/RowTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/RowTests.java
@@ -108,7 +108,7 @@ public class RowTests extends RefineTest {
     }
 
     // This way of serializing a row with indices is now deprecated, see GetRowsCommand.
-    @Test(expectedExceptions=IllegalArgumentException.class)
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void saveRowWithRecordIndex() {
         Row row = new Row(5);
         row.setCell(0, new Cell("I'm not empty", null));
@@ -118,10 +118,10 @@ public class RowTests extends RefineTest {
         when(options.get("recordIndex")).thenReturn(1);
         row.save(writer, options);
     }
-    
+
     @Test
     public void serializeRowTest() throws Exception {
-        
+
         String reconJson = "{\"id\":1533649346002675326,"
                 + "\"judgmentHistoryEntry\":1530278634724,"
                 + "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
@@ -134,7 +134,7 @@ public class RowTests extends RefineTest {
         Pool pool = mock(Pool.class);
         Recon recon = Recon.loadStreaming(reconJson);
         when(pool.getRecon("1533649346002675326")).thenReturn(recon);
-        
+
         String json = "{\"flagged\":false,"
                 + "\"starred\":false,"
                 + "\"cells\":["
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java b/OpenRefine/main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java
index 135b4c198..d7f8f72d5 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model.changes;
 
 import static org.testng.Assert.assertEquals;
@@ -44,11 +45,10 @@ import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.util.Pool;
 
-
 public class DataExtensionChangeTest extends RefineTest {
 
     Project project;
-    
+
     @Override
     @BeforeTest
     public void init() {
@@ -59,10 +59,10 @@ public class DataExtensionChangeTest extends RefineTest {
     public void SetUp()
             throws IOException, ModelException {
         project = createCSVProject(
-                "reconciled\n"+
-                "some item");
+                "reconciled\n" +
+                        "some item");
     }
-    
+
     @Test
     public void testApplyOldChange() throws Exception {
         Pool pool = new Pool();
@@ -76,7 +76,7 @@ public class DataExtensionChangeTest extends RefineTest {
         change.apply(project);
         assertEquals("Wikimedia content project", project.rows.get(0).getCell(1).value);
     }
-    
+
     @Test
     public void testApplyNewChange() throws Exception {
         Pool pool = new Pool();
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/changes/MassChangeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/changes/MassChangeTests.java
index 337a290a8..2d4f54580 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/changes/MassChangeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/changes/MassChangeTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model.changes;
 
 import static org.testng.Assert.assertTrue;
@@ -59,11 +60,9 @@ public class MassChangeTests extends RefineTest {
     }
 
     /**
-     * Test case for #914 - Demonstrates MassChange revert doesn't work by
-     * adding two columns to a project with a MassChange and then reverting.
-     * Without the fix, column "a" will be removed before column "b", causing
-     * column "b" removal to fail because it won't be found at index 1 as
-     * expected.
+     * Test case for #914 - Demonstrates MassChange revert doesn't work by adding two columns to a project with a
+     * MassChange and then reverting. Without the fix, column "a" will be removed before column "b", causing column "b"
+     * removal to fail because it won't be found at index 1 as expected.
      */
     @Test
     public void testWrongReverseOrder()
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java b/OpenRefine/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java
index 4491e65fd..3c5ec9973 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.model.recon;
 
 import static org.testng.Assert.assertEquals;
@@ -66,13 +67,12 @@ import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
 public class StandardReconConfigTests extends RefineTest {
-    
+
     @BeforeMethod
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon", ReconOperation.class);
         ReconConfig.registerReconConfig(getCoreModule(), "standard-service", StandardReconConfig.class);
     }
-    
 
     @Override
     @BeforeTest
@@ -81,6 +81,7 @@ public class StandardReconConfigTests extends RefineTest {
     }
 
     private class StandardReconConfigStub extends StandardReconConfig {
+
         public StandardReconConfigStub() {
             super("", "", "", "", "", false, new ArrayList<ColumnDetail>());
         }
@@ -88,9 +89,9 @@ public class StandardReconConfigTests extends RefineTest {
         public double wordDistanceTest(String s1, String s2) {
             return wordDistance(s1, s2);
         }
-        
+
         protected Recon createReconServiceResults(String text, ArrayNode resultsList, long historyEntryID) {
-        	return super.createReconServiceResults(text, resultsList, historyEntryID);
+            return super.createReconServiceResults(text, resultsList, historyEntryID);
         }
     }
 
@@ -110,110 +111,110 @@ public class StandardReconConfigTests extends RefineTest {
         Assert.assertTrue(!Double.isInfinite(r));
         Assert.assertTrue(!Double.isNaN(r));
     }
-    
+
     @Test
     public void serializeStandardReconConfig() throws Exception {
-        String json = " {\n" + 
-                "        \"mode\": \"standard-service\",\n" + 
-                "        \"service\": \"https://tools.wmflabs.org/openrefine-wikidata/en/api\",\n" + 
-                "        \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" + 
-                "        \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\",\n" + 
-                "        \"type\": {\n" + 
-                "                \"id\": \"Q13442814\",\n" + 
-                "                \"name\": \"scientific article\"\n" + 
-                "        },\n" + 
-                "        \"autoMatch\": true,\n" + 
-                "        \"columnDetails\": [\n" + 
-                "           {\n" + 
-                "             \"column\": \"organization_country\",\n" + 
-                "             \"propertyName\": \"SPARQL: P17/P297\",\n" + 
-                "             \"propertyID\": \"P17/P297\"\n" + 
-                "           },\n" + 
-                "           {\n" + 
-                "             \"column\": \"organization_id\",\n" + 
-                "             \"propertyName\": \"SPARQL: P3500|P2427\",\n" + 
-                "             \"propertyID\": \"P3500|P2427\"\n" + 
-                "           }\n" + 
-                "        ],\n" + 
-                "        \"limit\": 0\n" + 
+        String json = " {\n" +
+                "        \"mode\": \"standard-service\",\n" +
+                "        \"service\": \"https://tools.wmflabs.org/openrefine-wikidata/en/api\",\n" +
+                "        \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" +
+                "        \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\",\n" +
+                "        \"type\": {\n" +
+                "                \"id\": \"Q13442814\",\n" +
+                "                \"name\": \"scientific article\"\n" +
+                "        },\n" +
+                "        \"autoMatch\": true,\n" +
+                "        \"columnDetails\": [\n" +
+                "           {\n" +
+                "             \"column\": \"organization_country\",\n" +
+                "             \"propertyName\": \"SPARQL: P17/P297\",\n" +
+                "             \"propertyID\": \"P17/P297\"\n" +
+                "           },\n" +
+                "           {\n" +
+                "             \"column\": \"organization_id\",\n" +
+                "             \"propertyName\": \"SPARQL: P3500|P2427\",\n" +
+                "             \"propertyID\": \"P3500|P2427\"\n" +
+                "           }\n" +
+                "        ],\n" +
+                "        \"limit\": 0\n" +
                 " }";
         ReconConfig config = ReconConfig.reconstruct(json);
         TestUtils.isSerializedTo(config, json);
-        
+
         // the "mode" only appears once in the serialization result
         String fullJson = ParsingUtilities.mapper.writeValueAsString(config);
-        assertEquals(fullJson.indexOf("\"mode\"", fullJson.indexOf("\"mode\"")+1), -1);
+        assertEquals(fullJson.indexOf("\"mode\"", fullJson.indexOf("\"mode\"") + 1), -1);
     }
-    
+
     @Test
     public void testReconstructNoType() throws IOException {
-    	String json = "{\"mode\":\"standard-service\","
-    			+ "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
-    			+ "\"identifierSpace\":\"http://www.wikidata.org/entity/\","
-    			+ "\"schemaSpace\":\"http://www.wikidata.org/prop/direct/\","
-    			+ "\"type\":null,"
-    			+ "\"autoMatch\":true,"
-    			+ "\"columnDetails\":["
-    			+ "    {\"column\":\"_ - id\","
-    			+ "     \"property\":{\"id\":\"P3153\",\"name\":\"Crossref funder ID\"}}"
-    			+ "],"
-    			+ "\"limit\":0}";
-    	StandardReconConfig config = StandardReconConfig.reconstruct(json);
-    	assertNull(config.typeID);
-    	assertNull(config.typeName);
+        String json = "{\"mode\":\"standard-service\","
+                + "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
+                + "\"identifierSpace\":\"http://www.wikidata.org/entity/\","
+                + "\"schemaSpace\":\"http://www.wikidata.org/prop/direct/\","
+                + "\"type\":null,"
+                + "\"autoMatch\":true,"
+                + "\"columnDetails\":["
+                + "    {\"column\":\"_ - id\","
+                + "     \"property\":{\"id\":\"P3153\",\"name\":\"Crossref funder ID\"}}"
+                + "],"
+                + "\"limit\":0}";
+        StandardReconConfig config = StandardReconConfig.reconstruct(json);
+        assertNull(config.typeID);
+        assertNull(config.typeName);
     }
-    
+
     @Test
     public void testReconstructNoIdentifierSchemaSpaces() throws IOException {
-    	String json = "{\"mode\":\"standard-service\","
-    			+ "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
-    			+ "\"type\":null,"
-    			+ "\"autoMatch\":true,"
-    			+ "\"columnDetails\":[],"
-    			+ "\"limit\":0}";
-    	StandardReconConfig config = StandardReconConfig.reconstruct(json);
-    	assertEquals(config.identifierSpace, "http://localhost/identifier");
-    	assertEquals(config.schemaSpace, "http://localhost/schema");
+        String json = "{\"mode\":\"standard-service\","
+                + "\"service\":\"https://tools.wmflabs.org/openrefine-wikidata/en/api\","
+                + "\"type\":null,"
+                + "\"autoMatch\":true,"
+                + "\"columnDetails\":[],"
+                + "\"limit\":0}";
+        StandardReconConfig config = StandardReconConfig.reconstruct(json);
+        assertEquals(config.identifierSpace, "http://localhost/identifier");
+        assertEquals(config.schemaSpace, "http://localhost/schema");
     }
-    
+
     @Test
     public void formulateQueryTest() throws IOException {
         Project project = createCSVProject("title,director\n"
-                        + "mulholland drive,david lynch");
+                + "mulholland drive,david lynch");
 
         String config = " {\n" +
-                "        \"mode\": \"standard-service\",\n" + 
-                "        \"service\": \"https://tools.wmflabs.org/openrefine-wikidata/en/api\",\n" + 
-                "        \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" + 
-                "        \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\",\n" + 
-                "        \"type\": {\n" + 
-                "                \"id\": \"Q1234\",\n" + 
-                "                \"name\": \"movie\"\n" + 
-                "        },\n" + 
-                "        \"autoMatch\": true,\n" + 
-                "        \"columnDetails\": [\n" + 
-                "           {\n" + 
-                "             \"column\": \"director\",\n" + 
-                "             \"propertyName\": \"Director\",\n" + 
+                "        \"mode\": \"standard-service\",\n" +
+                "        \"service\": \"https://tools.wmflabs.org/openrefine-wikidata/en/api\",\n" +
+                "        \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" +
+                "        \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\",\n" +
+                "        \"type\": {\n" +
+                "                \"id\": \"Q1234\",\n" +
+                "                \"name\": \"movie\"\n" +
+                "        },\n" +
+                "        \"autoMatch\": true,\n" +
+                "        \"columnDetails\": [\n" +
+                "           {\n" +
+                "             \"column\": \"director\",\n" +
+                "             \"propertyName\": \"Director\",\n" +
                 "             \"propertyID\": \"P123\"\n" +
                 "           }\n" +
                 "        ]}";
         StandardReconConfig r = StandardReconConfig.reconstruct(config);
         Row row = project.rows.get(0);
         ReconJob job = r.createJob(project, 0, row, "title", row.getCell(0));
-        TestUtils.assertEqualsAsJson( job.toString(), "{"
-                        + "\"query\":\"mulholland drive\","
-                        + "\"type\":\"Q1234\","
-                        + "\"properties\":["
-                        + "     {\"pid\":\"P123\",\"v\":\"david lynch\"}"
-                        + "],"
-                        + "\"type_strict\":\"should\"}");
+        TestUtils.assertEqualsAsJson(job.toString(), "{"
+                + "\"query\":\"mulholland drive\","
+                + "\"type\":\"Q1234\","
+                + "\"properties\":["
+                + "     {\"pid\":\"P123\",\"v\":\"david lynch\"}"
+                + "],"
+                + "\"type_strict\":\"should\"}");
     }
 
     @Test
     public void reconNonJsonTest() throws Exception {
         Project project = createCSVProject("title,director\n"
-                        + "mulholland drive,david lynch");
+                + "mulholland drive,david lynch");
 
         String nonJsonResponse = "<!DOCTYPE html>\n" +
                 "<html lang=\"en\">\n" +
@@ -226,7 +227,6 @@ public class StandardReconConfigTests extends RefineTest {
                 "  </body>\n" +
                 "</html>";
 
-
         try (MockWebServer server = new MockWebServer()) {
             server.start();
             HttpUrl url = server.url("/openrefine-wikidata/en/api");
@@ -280,7 +280,7 @@ public class StandardReconConfigTests extends RefineTest {
     @Test
     public void reconTest() throws Exception {
         Project project = createCSVProject("title,director\n"
-                        + "mulholland drive,david lynch");
+                + "mulholland drive,david lynch");
 
         String reconResponse = "{\n" +
                 "q0: {\n" +
@@ -375,7 +375,9 @@ public class StandardReconConfigTests extends RefineTest {
             assertNotNull(request1);
             String query = request1.getBody().readUtf8Line();
             assertNotNull(query);
-            String expected = "queries=" + URLEncoder.encode("{\"q0\":{\"query\":\"david lynch\",\"type\":\"Q11424\",\"properties\":[{\"pid\":\"P57\",\"v\":\"david lynch\"}],\"type_strict\":\"should\"}}", "UTF-8");
+            String expected = "queries=" + URLEncoder.encode(
+                    "{\"q0\":{\"query\":\"david lynch\",\"type\":\"Q11424\",\"properties\":[{\"pid\":\"P57\",\"v\":\"david lynch\"}],\"type_strict\":\"should\"}}",
+                    "UTF-8");
             assertEquals(query, expected);
 
             Row row = project.rows.get(0);
@@ -387,157 +389,156 @@ public class StandardReconConfigTests extends RefineTest {
     }
 
     /**
-     * The UI format and the backend format differ for serialization
-     * (the UI never deserializes and the backend serialization did not matter).
-	 * TODO: change the frontend so it uses the same format.
+     * The UI format and the backend format differ for serialization (the UI never deserializes and the backend
+     * serialization did not matter). TODO: change the frontend so it uses the same format.
      */
     @Test
     public void deserializeColumnDetail() throws JsonParseException, JsonMappingException, IOException {
-    	String uiJson = "{\"column\":\"director\","
-    			+ "\"property\":{"
-    			+ "   \"id\":\"P123\","
-    			+ "   \"name\":\"Director\""
-    			+ "}}";
-    	String backendJson = "{\"column\":\"director\","
-    			+ "\"propertyID\":\"P123\","
-    			+ "\"propertyName\":\"Director\"}";
-    	ColumnDetail cd = ParsingUtilities.mapper.readValue(uiJson, ColumnDetail.class);
-    	TestUtils.isSerializedTo(cd, backendJson);
+        String uiJson = "{\"column\":\"director\","
+                + "\"property\":{"
+                + "   \"id\":\"P123\","
+                + "   \"name\":\"Director\""
+                + "}}";
+        String backendJson = "{\"column\":\"director\","
+                + "\"propertyID\":\"P123\","
+                + "\"propertyName\":\"Director\"}";
+        ColumnDetail cd = ParsingUtilities.mapper.readValue(uiJson, ColumnDetail.class);
+        TestUtils.isSerializedTo(cd, backendJson);
     }
-    
+
     @Test
     public void deserializeReconResult() throws JsonParseException, JsonMappingException, IOException {
-    	String json = "{\"score\":100.0,"
-    			+ "\"match\":false,"
-    			+ "\"type\":["
-    			+ "   {\"id\":\"Q17366755\","
-    			+ "    \"name\":\"hamlet in Alberta\"}],"
-    			+ "\"id\":\"Q5136635\","
-    			+ "\"name\":\"Cluny\"}";
-    	ReconResult rr = ParsingUtilities.mapper.readValue(json, ReconResult.class);
-    	assertEquals(rr.types.get(0).name, "hamlet in Alberta");
+        String json = "{\"score\":100.0,"
+                + "\"match\":false,"
+                + "\"type\":["
+                + "   {\"id\":\"Q17366755\","
+                + "    \"name\":\"hamlet in Alberta\"}],"
+                + "\"id\":\"Q5136635\","
+                + "\"name\":\"Cluny\"}";
+        ReconResult rr = ParsingUtilities.mapper.readValue(json, ReconResult.class);
+        assertEquals(rr.types.get(0).name, "hamlet in Alberta");
     }
-    
+
     // Issue #1913
     @Test
     public void reorderReconciliationResults() throws JsonParseException, JsonMappingException, IOException {
-    	String viafJson = " [\n" + 
-    			"\n" + 
-    			"    {\n" + 
-    			"        \"id\": \"18951129\",\n" + 
-    			"        \"name\": \"Varano, Camilla Battista da 1458-1524\",\n" + 
-    			"        \"type\": [\n" + 
-    			"            {\n" + 
-    			"                \"id\": \"/people/person\",\n" + 
-    			"                \"name\": \"Person\"\n" + 
-    			"            }\n" + 
-    			"        ],\n" + 
-    			"        \"score\": 0.1282051282051282,\n" + 
-    			"        \"match\": false\n" + 
-    			"    },\n" + 
-    			"    {\n" + 
-    			"        \"id\": \"102271932\",\n" + 
-    			"        \"name\": \"Shamsie, Kamila, 1973-....\",\n" + 
-    			"        \"type\": [\n" + 
-    			"            {\n" + 
-    			"                \"id\": \"/people/person\",\n" + 
-    			"                \"name\": \"Person\"\n" + 
-    			"            }\n" + 
-    			"        ],\n" + 
-    			"        \"score\": 0.23076923076923078,\n" + 
-    			"        \"match\": false\n" + 
-    			"    },\n" + 
-    			"    {\n" + 
-    			"        \"id\": \"63233597\",\n" + 
-    			"        \"name\": \"Camilla, Duchess of Cornwall, 1947-\",\n" + 
-    			"        \"type\": [\n" + 
-    			"            {\n" + 
-    			"                \"id\": \"/people/person\",\n" + 
-    			"                \"name\": \"Person\"\n" + 
-    			"            }\n" + 
-    			"        ],\n" + 
-    			"        \"score\": 0.14285714285714285,\n" + 
-    			"        \"match\": false\n" + 
-    			"    }\n" + 
-    			"\n" + 
-    			"]";
-    	
-    	StandardReconConfigStub stub = new StandardReconConfigStub();
-    	ArrayNode node = ParsingUtilities.mapper.readValue(viafJson, ArrayNode.class);
-    	Recon recon = stub.createReconServiceResults("Kamila", node, 1234L);
-    	assertTrue(recon.candidates.get(0).score > 0.2);
-    	assertEquals(recon.candidates.get(0).id, "102271932");
+        String viafJson = " [\n" +
+                "\n" +
+                "    {\n" +
+                "        \"id\": \"18951129\",\n" +
+                "        \"name\": \"Varano, Camilla Battista da 1458-1524\",\n" +
+                "        \"type\": [\n" +
+                "            {\n" +
+                "                \"id\": \"/people/person\",\n" +
+                "                \"name\": \"Person\"\n" +
+                "            }\n" +
+                "        ],\n" +
+                "        \"score\": 0.1282051282051282,\n" +
+                "        \"match\": false\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"id\": \"102271932\",\n" +
+                "        \"name\": \"Shamsie, Kamila, 1973-....\",\n" +
+                "        \"type\": [\n" +
+                "            {\n" +
+                "                \"id\": \"/people/person\",\n" +
+                "                \"name\": \"Person\"\n" +
+                "            }\n" +
+                "        ],\n" +
+                "        \"score\": 0.23076923076923078,\n" +
+                "        \"match\": false\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"id\": \"63233597\",\n" +
+                "        \"name\": \"Camilla, Duchess of Cornwall, 1947-\",\n" +
+                "        \"type\": [\n" +
+                "            {\n" +
+                "                \"id\": \"/people/person\",\n" +
+                "                \"name\": \"Person\"\n" +
+                "            }\n" +
+                "        ],\n" +
+                "        \"score\": 0.14285714285714285,\n" +
+                "        \"match\": false\n" +
+                "    }\n" +
+                "\n" +
+                "]";
+
+        StandardReconConfigStub stub = new StandardReconConfigStub();
+        ArrayNode node = ParsingUtilities.mapper.readValue(viafJson, ArrayNode.class);
+        Recon recon = stub.createReconServiceResults("Kamila", node, 1234L);
+        assertTrue(recon.candidates.get(0).score > 0.2);
+        assertEquals(recon.candidates.get(0).id, "102271932");
     }
-    
+
     @Test
     public void reorderReconciliationResultsStableSort() throws JsonParseException, JsonMappingException, IOException {
-    	String viafJson = " [\n" + 
-    			"\n" + 
-    			"    {\n" + 
-    			"        \"id\": \"18951129\",\n" + 
-    			"        \"name\": \"Varano, Camilla Battista da 1458-1524\",\n" + 
-    			"        \"type\": [\n" + 
-    			"            {\n" + 
-    			"                \"id\": \"/people/person\",\n" + 
-    			"                \"name\": \"Person\"\n" + 
-    			"            }\n" + 
-    			"        ],\n" + 
-    			"        \"score\": 0.3,\n" + 
-    			"        \"match\": false\n" + 
-    			"    },\n" + 
-    			"    {\n" + 
-    			"        \"id\": \"102271932\",\n" + 
-    			"        \"name\": \"Shamsie, Kamila, 1973-....\",\n" + 
-    			"        \"type\": [\n" + 
-    			"            {\n" + 
-    			"                \"id\": \"/people/person\",\n" + 
-    			"                \"name\": \"Person\"\n" + 
-    			"            }\n" + 
-    			"        ],\n" + 
-    			"        \"score\": 0.23076923076923078,\n" + 
-    			"        \"match\": false\n" + 
-    			"    },\n" + 
-    			"    {\n" + 
-    			"        \"id\": \"63233597\",\n" + 
-    			"        \"name\": \"Camilla, Duchess of Cornwall, 1947-\",\n" + 
-    			"        \"type\": [\n" + 
-    			"            {\n" + 
-    			"                \"id\": \"/people/person\",\n" + 
-    			"                \"name\": \"Person\"\n" + 
-    			"            }\n" + 
-    			"        ],\n" + 
-    			"        \"score\": 0.3,\n" + 
-    			"        \"match\": false\n" + 
-    			"    }\n" + 
-    			"\n" + 
-    			"]";
-    	
-    	StandardReconConfigStub stub = new StandardReconConfigStub();
-    	ArrayNode node = ParsingUtilities.mapper.readValue(viafJson, ArrayNode.class);
-    	Recon recon = stub.createReconServiceResults("Kamila", node, 1234L);
-    	assertEquals(recon.candidates.get(0).score, 0.3);
-    	assertEquals(recon.candidates.get(0).id, "18951129");
+        String viafJson = " [\n" +
+                "\n" +
+                "    {\n" +
+                "        \"id\": \"18951129\",\n" +
+                "        \"name\": \"Varano, Camilla Battista da 1458-1524\",\n" +
+                "        \"type\": [\n" +
+                "            {\n" +
+                "                \"id\": \"/people/person\",\n" +
+                "                \"name\": \"Person\"\n" +
+                "            }\n" +
+                "        ],\n" +
+                "        \"score\": 0.3,\n" +
+                "        \"match\": false\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"id\": \"102271932\",\n" +
+                "        \"name\": \"Shamsie, Kamila, 1973-....\",\n" +
+                "        \"type\": [\n" +
+                "            {\n" +
+                "                \"id\": \"/people/person\",\n" +
+                "                \"name\": \"Person\"\n" +
+                "            }\n" +
+                "        ],\n" +
+                "        \"score\": 0.23076923076923078,\n" +
+                "        \"match\": false\n" +
+                "    },\n" +
+                "    {\n" +
+                "        \"id\": \"63233597\",\n" +
+                "        \"name\": \"Camilla, Duchess of Cornwall, 1947-\",\n" +
+                "        \"type\": [\n" +
+                "            {\n" +
+                "                \"id\": \"/people/person\",\n" +
+                "                \"name\": \"Person\"\n" +
+                "            }\n" +
+                "        ],\n" +
+                "        \"score\": 0.3,\n" +
+                "        \"match\": false\n" +
+                "    }\n" +
+                "\n" +
+                "]";
+
+        StandardReconConfigStub stub = new StandardReconConfigStub();
+        ArrayNode node = ParsingUtilities.mapper.readValue(viafJson, ArrayNode.class);
+        Recon recon = stub.createReconServiceResults("Kamila", node, 1234L);
+        assertEquals(recon.candidates.get(0).score, 0.3);
+        assertEquals(recon.candidates.get(0).id, "18951129");
     }
-    
+
     /**
      * computing the features on an empty recon should not fail
      */
     @Test
     public void testComputeFeatures() {
-    	StandardReconConfigStub stub = new StandardReconConfigStub();
-    	Recon recon = stub.createNewRecon(2384738L);
-    	stub.computeFeatures(recon, "my string");
-    	assertNotNull(recon.features);
+        StandardReconConfigStub stub = new StandardReconConfigStub();
+        Recon recon = stub.createNewRecon(2384738L);
+        stub.computeFeatures(recon, "my string");
+        assertNotNull(recon.features);
     }
-    
+
     /**
      * Should not happen, but added for extra safety
      */
     @Test
     public void testComputeFeaturesNullText() {
-    	StandardReconConfigStub stub = new StandardReconConfigStub();
-    	Recon recon = stub.createNewRecon(2384738L);
-    	stub.computeFeatures(recon, null);
-    	assertNotNull(recon.features);
+        StandardReconConfigStub stub = new StandardReconConfigStub();
+        Recon recon = stub.createNewRecon(2384738L);
+        stub.computeFeatures(recon, null);
+        assertNotNull(recon.features);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.java
index c04ae5ae7..ac53ba815 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/BlankDownTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.cell;
 
 import java.util.ArrayList;
@@ -49,29 +50,29 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class BlankDownTests extends RefineTest {
-    
+
     Project project = null;
-    
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "blank-down", BlankDownOperation.class);
     }
-    
+
     @BeforeMethod
     public void setUp() {
         project = createCSVProject(
-                "key,first,second\n"+
-                "a,b,c\n"+
-                ",d,c\n"+
-                "e,f,c\n"+
-                ",,c\n");
+                "key,first,second\n" +
+                        "a,b,c\n" +
+                        ",d,c\n" +
+                        "e,f,c\n" +
+                        ",,c\n");
     }
-    
+
     @AfterMethod
     public void tearDown() {
         ProjectManager.singleton.deleteProject(project.id);
     }
-    
+
     @Test
     public void serializeBlankDownOperation() throws Exception {
         String json = "{\"op\":\"core/blank-down\","
@@ -81,7 +82,7 @@ public class BlankDownTests extends RefineTest {
         AbstractOperation op = ParsingUtilities.mapper.readValue(json, BlankDownOperation.class);
         TestUtils.isSerializedTo(op, json);
     }
-    
+
     @Test
     public void testBlankDownRecords() throws Exception {
         AbstractOperation op = new BlankDownOperation(
@@ -89,13 +90,13 @@ public class BlankDownTests extends RefineTest {
                 "second");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("c", project.rows.get(0).cells.get(2).value);
         Assert.assertNull(project.rows.get(1).cells.get(2));
         Assert.assertEquals("c", project.rows.get(2).cells.get(2).value);
         Assert.assertNull(project.rows.get(3).cells.get(2));
     }
-    
+
     @Test
     public void testBlankDownRows() throws Exception {
         AbstractOperation op = new BlankDownOperation(
@@ -103,33 +104,33 @@ public class BlankDownTests extends RefineTest {
                 "second");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("c", project.rows.get(0).cells.get(2).value);
         Assert.assertNull(project.rows.get(1).cells.get(2));
         Assert.assertNull(project.rows.get(2).cells.get(2));
         Assert.assertNull(project.rows.get(3).cells.get(2));
     }
-    
+
     @Test
     public void testKeyColumnIndex() throws Exception {
-    	// Shift all column indices
-    	for(Row r : project.rows) {
-    		r.cells.add(0, null);
-    	}
-    	List<Column> newColumns = new ArrayList<>();
-    	for(Column c : project.columnModel.columns) {
-    		newColumns.add(new Column(c.getCellIndex()+1, c.getName()));
-    	}
-    	project.columnModel.columns.clear();
-    	project.columnModel.columns.addAll(newColumns);
-    	project.columnModel.update();
-    	
-    	AbstractOperation op = new BlankDownOperation(
+        // Shift all column indices
+        for (Row r : project.rows) {
+            r.cells.add(0, null);
+        }
+        List<Column> newColumns = new ArrayList<>();
+        for (Column c : project.columnModel.columns) {
+            newColumns.add(new Column(c.getCellIndex() + 1, c.getName()));
+        }
+        project.columnModel.columns.clear();
+        project.columnModel.columns.addAll(newColumns);
+        project.columnModel.update();
+
+        AbstractOperation op = new BlankDownOperation(
                 EngineConfig.reconstruct("{\"mode\":\"record-based\",\"facets\":[]}"),
                 "second");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("c", project.rows.get(0).cells.get(3).value);
         Assert.assertNull(project.rows.get(1).cells.get(3));
         Assert.assertEquals("c", project.rows.get(2).cells.get(3).value);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/FillDownTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/FillDownTests.java
index 2d12ff6a4..f8e396949 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/FillDownTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/FillDownTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.cell;
 
 import java.util.ArrayList;
@@ -49,29 +50,29 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class FillDownTests extends RefineTest {
-    
+
     Project project = null;
-    
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "fill-down", FillDownOperation.class);
     }
-    
+
     @BeforeMethod
     public void setUp() {
         project = createCSVProject(
-                "key,first,second\n"+
-                "a,b,c\n"+
-                ",d,\n"+
-                "e,f,\n"+
-                ",,h\n");
+                "key,first,second\n" +
+                        "a,b,c\n" +
+                        ",d,\n" +
+                        "e,f,\n" +
+                        ",,h\n");
     }
-    
+
     @AfterMethod
     public void tearDown() {
         ProjectManager.singleton.deleteProject(project.id);
     }
-    
+
     @Test
     public void serializeFillDownOperation() throws Exception {
         String json = "{\"op\":\"core/fill-down\","
@@ -80,7 +81,7 @@ public class FillDownTests extends RefineTest {
                 + "\"columnName\":\"my key\"}";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, FillDownOperation.class), json);
     }
-    
+
     @Test
     public void testFillDownRecordKey() throws Exception {
         AbstractOperation op = new FillDownOperation(
@@ -88,13 +89,13 @@ public class FillDownTests extends RefineTest {
                 "key");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("a", project.rows.get(0).cells.get(0).value);
         Assert.assertEquals("a", project.rows.get(1).cells.get(0).value);
         Assert.assertEquals("e", project.rows.get(2).cells.get(0).value);
         Assert.assertEquals("e", project.rows.get(3).cells.get(0).value);
     }
-    
+
     // For issue #742
     // https://github.com/OpenRefine/OpenRefine/issues/742
     @Test
@@ -104,44 +105,44 @@ public class FillDownTests extends RefineTest {
                 "second");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("c", project.rows.get(0).cells.get(2).value);
         Assert.assertEquals("c", project.rows.get(1).cells.get(2).value);
         Assert.assertNull(project.rows.get(2).cells.get(2));
         Assert.assertEquals("h", project.rows.get(3).cells.get(2).value);
     }
-    
+
     // For issue #742
     // https://github.com/OpenRefine/OpenRefine/issues/742
     @Test
-    public void testFillDownRows() throws Exception {       
+    public void testFillDownRows() throws Exception {
         AbstractOperation op = new FillDownOperation(
                 EngineConfig.reconstruct("{\"mode\":\"row-based\",\"facets\":[]}"),
                 "second");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("c", project.rows.get(0).cells.get(2).value);
         Assert.assertEquals("c", project.rows.get(1).cells.get(2).value);
         Assert.assertEquals("c", project.rows.get(2).cells.get(2).value);
         Assert.assertEquals("h", project.rows.get(3).cells.get(2).value);
     }
-    
+
     @Test
     public void testKeyColumnIndex() throws Exception {
-    	// Shift all column indices
-    	for(Row r : project.rows) {
-    		r.cells.add(0, null);
-    	}
-    	List<Column> newColumns = new ArrayList<>();
-    	for(Column c : project.columnModel.columns) {
-    		newColumns.add(new Column(c.getCellIndex()+1, c.getName()));
-    	}
-    	project.columnModel.columns.clear();
-    	project.columnModel.columns.addAll(newColumns);
-    	project.columnModel.update();
-    	
-    	AbstractOperation op = new FillDownOperation(
+        // Shift all column indices
+        for (Row r : project.rows) {
+            r.cells.add(0, null);
+        }
+        List<Column> newColumns = new ArrayList<>();
+        for (Column c : project.columnModel.columns) {
+            newColumns.add(new Column(c.getCellIndex() + 1, c.getName()));
+        }
+        project.columnModel.columns.clear();
+        project.columnModel.columns.addAll(newColumns);
+        project.columnModel.update();
+
+        AbstractOperation op = new FillDownOperation(
                 EngineConfig.reconstruct("{\"mode\":\"record-based\",\"facets\":[]}"),
                 "second");
         Process process = op.createProcess(project, new Properties());
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java
index 54aff3f3e..4234f917b 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/JoinMultiValuedCellsTests.java
@@ -50,9 +50,8 @@ import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class JoinMultiValuedCellsTests extends RefineTest {
-    
+
     Project project;
 
     @Override
@@ -60,22 +59,22 @@ public class JoinMultiValuedCellsTests extends RefineTest {
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "multivalued-cell-join", MultiValuedCellJoinOperation.class);
     }
-    
+
     @BeforeMethod
     public void createProject() {
         project = createCSVProject(
                 "Key,Value\n"
-                + "Record_1,one\n"
-                + ",two\n"
-                + ",three\n"
-                + ",four\n");
+                        + "Record_1,one\n"
+                        + ",two\n"
+                        + ",three\n"
+                        + ",four\n");
     }
-    
+
     @Test
     public void serializeMultiValuedCellJoinOperation() throws Exception {
         String json = "{\"op\":\"core/multivalued-cell-join\","
@@ -85,7 +84,6 @@ public class JoinMultiValuedCellsTests extends RefineTest {
                 + "\"separator\":\",\"}";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, MultiValuedCellJoinOperation.class), json);
     }
-    
 
     /*
      * Test to demonstrate the intended behaviour of the function
@@ -94,15 +92,15 @@ public class JoinMultiValuedCellsTests extends RefineTest {
     @Test
     public void testJoinMultiValuedCells() throws Exception {
         AbstractOperation op = new MultiValuedCellJoinOperation(
-            "Value",
-            "Key",
-            ",");
+                "Value",
+                "Key",
+                ",");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one,two,three,four");
     }
@@ -110,19 +108,17 @@ public class JoinMultiValuedCellsTests extends RefineTest {
     @Test
     public void testJoinMultiValuedCellsMultipleSpaces() throws Exception {
         AbstractOperation op = new MultiValuedCellJoinOperation(
-            "Value",
-            "Key",
-            ",     ,");
+                "Value",
+                "Key",
+                ",     ,");
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one,     ,two,     ,three,     ,four");
     }
 
-
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java
index 9851741f6..dedb9d6b3 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java
@@ -67,8 +67,8 @@ import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class KeyValueColumnizeTests extends RefineTest {
+
     // dependencies
     private RefineServlet servlet;
     private Project project;
@@ -77,7 +77,6 @@ public class KeyValueColumnizeTests extends RefineTest {
     private ImportingJob job;
     private SeparatorBasedImporter importer;
 
-
     @Override
     @BeforeTest
     public void init() {
@@ -86,7 +85,7 @@ public class KeyValueColumnizeTests extends RefineTest {
 
     @BeforeMethod
     public void SetUp() throws IOException, ModelException {
-	servlet = new RefineServletStub();
+        servlet = new RefineServletStub();
         File dir = TestUtils.createTempDirectory("openrefine-test-workspace-dir");
         FileProjectManager.initialize(dir);
         project = new Project();
@@ -96,21 +95,21 @@ public class KeyValueColumnizeTests extends RefineTest {
         options = mock(ObjectNode.class);
         OperationRegistry.registerOperation(getCoreModule(), "key-value-columnize", KeyValueColumnizeOperation.class);
 
-	ImportingManager.initialize(servlet);
+        ImportingManager.initialize(servlet);
         job = ImportingManager.createJob();
-	importer = new SeparatorBasedImporter(); 
+        importer = new SeparatorBasedImporter();
     }
 
     @AfterMethod
     public void TearDown() {
-	ImportingManager.disposeJob(job.id);
-	ProjectManager.singleton.deleteProject(project.id);
-	job = null;
+        ImportingManager.disposeJob(job.id);
+        ProjectManager.singleton.deleteProject(project.id);
+        job = null;
         project = null;
-	pm = null;
+        pm = null;
         options = null;
     }
-    
+
     @Test
     public void serializeKeyValueColumnizeOperation() throws Exception {
         String json = "{\"op\":\"core/key-value-columnize\","
@@ -130,28 +129,29 @@ public class KeyValueColumnizeTests extends RefineTest {
 
     /**
      * Test in the case where an ID is available in the first column.
+     * 
      * @throws Exception
      */
     @Test
     public void testKeyValueColumnizeWithID() throws Exception {
         Project project = createCSVProject(
                 "ID,Cat,Val\n"
-                + "1,a,1\n"
-                + "1,b,3\n"
-                + "2,b,4\n"
-                + "2,c,5\n"
-                + "3,a,2\n"
-                + "3,b,5\n"
-                + "3,d,3\n");
+                        + "1,a,1\n"
+                        + "1,b,3\n"
+                        + "2,b,4\n"
+                        + "2,c,5\n"
+                        + "3,a,2\n"
+                        + "3,b,5\n"
+                        + "3,d,3\n");
 
         AbstractOperation op = new KeyValueColumnizeOperation(
                 "Cat", "Val", null);
 
         Process process = op.createProcess(project, new Properties());
-        
+
         process.performImmediate();
-            
-        // Expected output from the GUI. 
+
+        // Expected output from the GUI.
         // ID,a,b,c,d
         // 1,1,3,,
         // 2,,4,5,
@@ -163,26 +163,26 @@ public class KeyValueColumnizeTests extends RefineTest {
         Assert.assertEquals(project.columnModel.columns.get(3).getName(), "c");
         Assert.assertEquals(project.columnModel.columns.get(4).getName(), "d");
         Assert.assertEquals(project.rows.size(), 3);
-        
+
         // The actual row data structure has to leave the columns model untouched for redo/undo purpose.
         // So we have 2 empty columns(column 1,2) on the row level.
         // 1,1,3,,
         Assert.assertEquals(project.rows.get(0).cells.get(0).value, "1");
         Assert.assertEquals(project.rows.get(0).cells.get(3).value, "1");
         Assert.assertEquals(project.rows.get(0).cells.get(4).value, "3");
-        
+
         // 2,,4,5,
         Assert.assertEquals(project.rows.get(1).cells.get(0).value, "2");
         Assert.assertEquals(project.rows.get(1).cells.get(4).value, "4");
         Assert.assertEquals(project.rows.get(1).cells.get(5).value, "5");
-        
+
         // 3,2,5,,3
         Assert.assertEquals(project.rows.get(2).cells.get(0).value, "3");
         Assert.assertEquals(project.rows.get(2).cells.get(3).value, "2");
         Assert.assertEquals(project.rows.get(2).cells.get(4).value, "5");
         Assert.assertEquals(project.rows.get(2).cells.get(6).value, "3");
     }
-    
+
     /**
      * Test to demonstrate the intended behaviour of the function, for issue #1214
      * https://github.com/OpenRefine/OpenRefine/issues/1214
@@ -190,57 +190,55 @@ public class KeyValueColumnizeTests extends RefineTest {
 
     @Test
     public void testKeyValueColumnize() throws Exception {
-	String csv = "Key,Value\n"
-		+ "merchant,Katie\n"
-		+ "fruit,apple\n"
-		+ "price,1.2\n"
-		+ "fruit,pear\n"
-		+ "price,1.5\n"
-		+ "merchant,John\n"
-		+ "fruit,banana\n"
-		+ "price,3.1\n";
-	prepareOptions(",", 20, 0, 0, 1, false, false);
+        String csv = "Key,Value\n"
+                + "merchant,Katie\n"
+                + "fruit,apple\n"
+                + "price,1.2\n"
+                + "fruit,pear\n"
+                + "price,1.5\n"
+                + "merchant,John\n"
+                + "fruit,banana\n"
+                + "price,3.1\n";
+        prepareOptions(",", 20, 0, 0, 1, false, false);
         List<Exception> exceptions = new ArrayList<Exception>();
         importer.parseOneFile(project, pm, job, "filesource", new StringReader(csv), -1, options, exceptions);
         project.update();
         ProjectManager.singleton.registerProject(project, pm);
 
-	AbstractOperation op = new KeyValueColumnizeOperation(
-		"Key",
-		"Value",
-		null);
+        AbstractOperation op = new KeyValueColumnizeOperation(
+                "Key",
+                "Value",
+                null);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
-	int merchantCol = project.columnModel.getColumnByName("merchant").getCellIndex();
-	int fruitCol = project.columnModel.getColumnByName("fruit").getCellIndex();
-	int priceCol = project.columnModel.getColumnByName("price").getCellIndex();
-	
-	Assert.assertEquals(project.rows.get(0).getCellValue(merchantCol), "Katie");
-	Assert.assertEquals(project.rows.get(1).getCellValue(merchantCol), null);
-	Assert.assertEquals(project.rows.get(2).getCellValue(merchantCol), "John");
-	Assert.assertEquals(project.rows.get(0).getCellValue(fruitCol), "apple");
-	Assert.assertEquals(project.rows.get(1).getCellValue(fruitCol), "pear");
-	Assert.assertEquals(project.rows.get(2).getCellValue(fruitCol), "banana");
-	Assert.assertEquals(project.rows.get(0).getCellValue(priceCol), "1.2");
-	Assert.assertEquals(project.rows.get(1).getCellValue(priceCol), "1.5");
-	Assert.assertEquals(project.rows.get(2).getCellValue(priceCol), "3.1");
+        int merchantCol = project.columnModel.getColumnByName("merchant").getCellIndex();
+        int fruitCol = project.columnModel.getColumnByName("fruit").getCellIndex();
+        int priceCol = project.columnModel.getColumnByName("price").getCellIndex();
+
+        Assert.assertEquals(project.rows.get(0).getCellValue(merchantCol), "Katie");
+        Assert.assertEquals(project.rows.get(1).getCellValue(merchantCol), null);
+        Assert.assertEquals(project.rows.get(2).getCellValue(merchantCol), "John");
+        Assert.assertEquals(project.rows.get(0).getCellValue(fruitCol), "apple");
+        Assert.assertEquals(project.rows.get(1).getCellValue(fruitCol), "pear");
+        Assert.assertEquals(project.rows.get(2).getCellValue(fruitCol), "banana");
+        Assert.assertEquals(project.rows.get(0).getCellValue(priceCol), "1.2");
+        Assert.assertEquals(project.rows.get(1).getCellValue(priceCol), "1.5");
+        Assert.assertEquals(project.rows.get(2).getCellValue(priceCol), "3.1");
     }
 
     private void prepareOptions(
             String sep, int limit, int skip, int ignoreLines,
             int headerLines, boolean guessValueType, boolean ignoreQuotes) {
-            
-            whenGetStringOption("separator", options, sep);
-            whenGetIntegerOption("limit", options, limit);
-            whenGetIntegerOption("skipDataLines", options, skip);
-            whenGetIntegerOption("ignoreLines", options, ignoreLines);
-            whenGetIntegerOption("headerLines", options, headerLines);
-            whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
-            whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
-            whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
-        }
 
+        whenGetStringOption("separator", options, sep);
+        whenGetIntegerOption("limit", options, limit);
+        whenGetIntegerOption("skipDataLines", options, skip);
+        whenGetIntegerOption("ignoreLines", options, ignoreLines);
+        whenGetIntegerOption("headerLines", options, headerLines);
+        whenGetBooleanOption("guessCellValueTypes", options, guessValueType);
+        whenGetBooleanOption("processQuotes", options, !ignoreQuotes);
+        whenGetBooleanOption("storeBlankCellsAsNulls", options, true);
+    }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.java
index f29e52c2a..adef7c952 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/MassOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.cell;
 
 import java.util.List;
@@ -43,12 +44,12 @@ public class MassOperationTests extends RefineTest {
 
     private List<Edit> editList;
     private String editsString;
-    
+
     @BeforeSuite
     public void setUp() {
         OperationRegistry.registerOperation(getCoreModule(), "mass-edit", MassEditOperation.class);
     }
-    
+
     @Test
     public void serializeMassEditOperation() throws Exception {
         String json = "{\"op\":\"core/mass-edit\","
@@ -63,11 +64,12 @@ public class MassOperationTests extends RefineTest {
     public void testReconstructEditString() throws Exception {
         editsString = "[{\"from\":[\"String\"],\"to\":\"newString\",\"type\":\"text\"}]";
 
-        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
+        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {
+        });
 
         Assert.assertEquals(editList.get(0).from.size(), 1);
         Assert.assertEquals(editList.get(0).from.get(0), "String");
-        Assert.assertEquals(editList.get(0).to,"newString" );
+        Assert.assertEquals(editList.get(0).to, "newString");
         Assert.assertFalse(editList.get(0).fromBlank);
         Assert.assertFalse(editList.get(0).fromError);
     }
@@ -76,68 +78,73 @@ public class MassOperationTests extends RefineTest {
     public void testReconstructEditMultiString() throws Exception {
         editsString = "[{\"from\":[\"String1\",\"String2\"],\"to\":\"newString\",\"type\":\"text\"}]";
 
-        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
+        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {
+        });
 
         Assert.assertEquals(editList.get(0).from.size(), 2);
         Assert.assertEquals(editList.get(0).from.get(0), "String1");
         Assert.assertEquals(editList.get(0).from.get(1), "String2");
-        Assert.assertEquals(editList.get(0).to,"newString" );
+        Assert.assertEquals(editList.get(0).to, "newString");
         Assert.assertFalse(editList.get(0).fromBlank);
         Assert.assertFalse(editList.get(0).fromError);
     }
 
     @Test
     public void testReconstructEditBoolean() throws Exception {
-      editsString = "[{\"from\":[true],\"to\":\"newString\",\"type\":\"text\"}]";
+        editsString = "[{\"from\":[true],\"to\":\"newString\",\"type\":\"text\"}]";
 
-      editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
+        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {
+        });
 
-      Assert.assertEquals(editList.get(0).from.size(), 1);
-      Assert.assertEquals(editList.get(0).from.get(0), "true");
-      Assert.assertEquals(editList.get(0).to,"newString" );
-      Assert.assertFalse(editList.get(0).fromBlank);
-      Assert.assertFalse(editList.get(0).fromError);
+        Assert.assertEquals(editList.get(0).from.size(), 1);
+        Assert.assertEquals(editList.get(0).from.get(0), "true");
+        Assert.assertEquals(editList.get(0).to, "newString");
+        Assert.assertFalse(editList.get(0).fromBlank);
+        Assert.assertFalse(editList.get(0).fromError);
     }
 
     @Test
     public void testReconstructEditNumber() throws Exception {
-      editsString = "[{\"from\":[1],\"to\":\"newString\",\"type\":\"text\"}]";
+        editsString = "[{\"from\":[1],\"to\":\"newString\",\"type\":\"text\"}]";
 
-      editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
+        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {
+        });
 
-      Assert.assertEquals(editList.get(0).from.size(), 1);
-      Assert.assertEquals(editList.get(0).from.get(0), "1");
-      Assert.assertEquals(editList.get(0).to,"newString" );
-      Assert.assertFalse(editList.get(0).fromBlank);
-      Assert.assertFalse(editList.get(0).fromError);
+        Assert.assertEquals(editList.get(0).from.size(), 1);
+        Assert.assertEquals(editList.get(0).from.get(0), "1");
+        Assert.assertEquals(editList.get(0).to, "newString");
+        Assert.assertFalse(editList.get(0).fromBlank);
+        Assert.assertFalse(editList.get(0).fromError);
     }
 
     @Test
     public void testReconstructEditDate() throws Exception {
-      editsString = "[{\"from\":[\"2018-10-04T00:00:00Z\"],\"to\":\"newString\",\"type\":\"text\"}]";
+        editsString = "[{\"from\":[\"2018-10-04T00:00:00Z\"],\"to\":\"newString\",\"type\":\"text\"}]";
 
-      editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
+        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {
+        });
 
-      Assert.assertEquals(editList.get(0).from.get(0), "2018-10-04T00:00:00Z");
-      Assert.assertEquals(editList.get(0).to,"newString" );
-      Assert.assertFalse(editList.get(0).fromBlank);
-      Assert.assertFalse(editList.get(0).fromError);
+        Assert.assertEquals(editList.get(0).from.get(0), "2018-10-04T00:00:00Z");
+        Assert.assertEquals(editList.get(0).to, "newString");
+        Assert.assertFalse(editList.get(0).fromBlank);
+        Assert.assertFalse(editList.get(0).fromError);
     }
 
     @Test
     public void testReconstructEditEmpty() throws Exception {
-      editsString = "[{\"from\":[\"\"],\"to\":\"newString\",\"type\":\"text\"}]";
+        editsString = "[{\"from\":[\"\"],\"to\":\"newString\",\"type\":\"text\"}]";
 
-      editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {});
+        editList = ParsingUtilities.mapper.readValue(editsString, new TypeReference<List<Edit>>() {
+        });
 
-      Assert.assertEquals(editList.get(0).from.size(), 1);
-      Assert.assertEquals(editList.get(0).from.get(0), "");
-      Assert.assertEquals(editList.get(0).to,"newString" );
-      Assert.assertTrue(editList.get(0).fromBlank);
-      Assert.assertFalse(editList.get(0).fromError);
+        Assert.assertEquals(editList.get(0).from.size(), 1);
+        Assert.assertEquals(editList.get(0).from.get(0), "");
+        Assert.assertEquals(editList.get(0).to, "newString");
+        Assert.assertTrue(editList.get(0).fromBlank);
+        Assert.assertFalse(editList.get(0).fromError);
 
     }
 
-    //Not yet testing for mass edit from OR Error
+    // Not yet testing for mass edit from OR Error
 
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java
index 061fddea4..5ea80f92d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/SplitMultiValuedCellsTests.java
@@ -33,7 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.operations.cell;
 
-
 import java.util.Properties;
 
 import org.slf4j.LoggerFactory;
@@ -50,9 +49,8 @@ import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class SplitMultiValuedCellsTests extends RefineTest {
-    
+
     Project project;
 
     @Override
@@ -61,14 +59,14 @@ public class SplitMultiValuedCellsTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
         OperationRegistry.registerOperation(getCoreModule(), "multivalued-cell-split", MultiValuedCellSplitOperation.class);
     }
-    
+
     @BeforeMethod
     public void createProject() {
         project = createCSVProject(
                 "Key,Value\n"
-              + "Record_1,one:two;three four;fiveSix SevèËight;niné91011twelve thirteen 14Àifteen\n");
+                        + "Record_1,one:two;three four;fiveSix SevèËight;niné91011twelve thirteen 14Àifteen\n");
     }
-    
+
     @Test
     public void serializeMultiValuedCellSplitOperationWithSeparator() throws Exception {
         String json = "{\"op\":\"core/multivalued-cell-split\","
@@ -80,7 +78,7 @@ public class SplitMultiValuedCellsTests extends RefineTest {
                 + "\"regex\":false}";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, MultiValuedCellSplitOperation.class), json);
     }
-    
+
     @Test
     public void serializeMultiValuedCellSplitOperationWithLengths() throws Exception {
         String json = "{\"op\":\"core/multivalued-cell-split\","
@@ -100,35 +98,36 @@ public class SplitMultiValuedCellsTests extends RefineTest {
     @Test
     public void testSplitMultiValuedCellsTextSeparator() throws Exception {
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            ":",
-            false);
+                "Value",
+                "Key",
+                ":",
+                false);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one");
         Assert.assertEquals(project.rows.get(1).getCellValue(keyCol), null);
-        Assert.assertEquals(project.rows.get(1).getCellValue(valueCol), "two;three four;fiveSix SevèËight;niné91011twelve thirteen 14Àifteen");
+        Assert.assertEquals(project.rows.get(1).getCellValue(valueCol),
+                "two;three four;fiveSix SevèËight;niné91011twelve thirteen 14Àifteen");
     }
 
     @Test
     public void testSplitMultiValuedCellsRegExSeparator() throws Exception {
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            "\\W",
-            true);
+                "Value",
+                "Key",
+                "\\W",
+                true);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one");
         Assert.assertEquals(project.rows.get(1).getCellValue(keyCol), null);
@@ -141,18 +140,18 @@ public class SplitMultiValuedCellsTests extends RefineTest {
 
     @Test
     public void testSplitMultiValuedCellsLengths() throws Exception {
-        int[] lengths = {4,4,6,4};
+        int[] lengths = { 4, 4, 6, 4 };
 
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            lengths);
+                "Value",
+                "Key",
+                lengths);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one:");
         Assert.assertEquals(project.rows.get(1).getCellValue(keyCol), null);
@@ -166,10 +165,10 @@ public class SplitMultiValuedCellsTests extends RefineTest {
     @Test
     public void testSplitMultiValuedCellsTextCase() throws Exception {
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            "(?<=\\p{Lower}|[\\p{Lower}][\\s])(?=\\p{Upper})",
-            true);
+                "Value",
+                "Key",
+                "(?<=\\p{Lower}|[\\p{Lower}][\\s])(?=\\p{Upper})",
+                true);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
@@ -189,10 +188,10 @@ public class SplitMultiValuedCellsTests extends RefineTest {
     @Test
     public void testSplitMultiValuedCellsTextCaseReverse() throws Exception {
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            "(?<=\\p{Upper}|[\\p{Upper}][\\s])(?=\\p{Lower})",
-            true);
+                "Value",
+                "Key",
+                "(?<=\\p{Upper}|[\\p{Upper}][\\s])(?=\\p{Lower})",
+                true);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
@@ -214,16 +213,16 @@ public class SplitMultiValuedCellsTests extends RefineTest {
     @Test
     public void testSplitMultiValuedCellsTextNumber() throws Exception {
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            "(?<=\\p{Digit}|[\\p{Digit}][\\s])(?=\\p{L})",
-            true);
+                "Value",
+                "Key",
+                "(?<=\\p{Digit}|[\\p{Digit}][\\s])(?=\\p{L})",
+                true);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one:two;three four;fiveSix SevèËight;niné91011");
         Assert.assertEquals(project.rows.get(1).getCellValue(keyCol), null);
@@ -235,16 +234,16 @@ public class SplitMultiValuedCellsTests extends RefineTest {
     @Test
     public void testSplitMultiValuedCellsTextNumberReverse() throws Exception {
         AbstractOperation op = new MultiValuedCellSplitOperation(
-            "Value",
-            "Key",
-            "(?<=\\p{L}|[\\p{L}][\\s])(?=\\p{Digit})",
-            true);
+                "Value",
+                "Key",
+                "(?<=\\p{L}|[\\p{L}][\\s])(?=\\p{Digit})",
+                true);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
 
         int keyCol = project.columnModel.getColumnByName("Key").getCellIndex();
         int valueCol = project.columnModel.getColumnByName("Value").getCellIndex();
-        
+
         Assert.assertEquals(project.rows.get(0).getCellValue(keyCol), "Record_1");
         Assert.assertEquals(project.rows.get(0).getCellValue(valueCol), "one:two;three four;fiveSix SevèËight;niné");
         Assert.assertEquals(project.rows.get(1).getCellValue(keyCol), null);
@@ -253,4 +252,3 @@ public class SplitMultiValuedCellsTests extends RefineTest {
         Assert.assertEquals(project.rows.get(2).getCellValue(valueCol), "14Àifteen");
     }
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java
index 947972fe3..990c7959c 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java
@@ -50,7 +50,7 @@ public class TransposeTests extends RefineTest {
         logger = LoggerFactory.getLogger(this.getClass());
         OperationRegistry.registerOperation(getCoreModule(), "transpose-rows-into-columns", TransposeRowsIntoColumnsOperation.class);
     }
-    
+
     @Test
     public void testTransposeRowsIntoColumnsOperation() throws Exception {
         String json = "{\"op\":\"core/transpose-rows-into-columns\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java
index a5e75858b..2a50a5a20 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java
@@ -70,7 +70,6 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 
-
 public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
 
     static final String ENGINE_JSON_URLS = "{\"mode\":\"row-based\"}";
@@ -91,21 +90,23 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             + "    {\"name\":\"user-agent\",\"value\":\"OpenRefine 3.0 rc.1 [TRUNK]\"},"
             + "    {\"name\":\"accept\",\"value\":\"application/json\"}"
             + "]}";
-    
+
     private String processJson = ""
-            +"{\n" + 
-            "    \"description\" : \"Create column employments at index 2 by fetching URLs based on column orcid using expression grel:\\\"https://pub.orcid.org/\\\"+value+\\\"/employments\\\"\",\n" + 
-            "    \"id\" : %d,\n" + 
-            "    \"immediate\" : false,\n" + 
-            "    \"progress\" : 0,\n" + 
-            "    \"status\" : \"pending\"\n" + 
+            + "{\n" +
+            "    \"description\" : \"Create column employments at index 2 by fetching URLs based on column orcid using expression grel:\\\"https://pub.orcid.org/\\\"+value+\\\"/employments\\\"\",\n"
+            +
+            "    \"id\" : %d,\n" +
+            "    \"immediate\" : false,\n" +
+            "    \"progress\" : 0,\n" +
+            "    \"status\" : \"pending\"\n" +
             " }";
 
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
-        OperationRegistry.registerOperation(getCoreModule(), "column-addition-by-fetching-urls", ColumnAdditionByFetchingURLsOperation.class);
+        OperationRegistry.registerOperation(getCoreModule(), "column-addition-by-fetching-urls",
+                ColumnAdditionByFetchingURLsOperation.class);
     }
 
     // dependencies
@@ -115,7 +116,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
 
     @BeforeMethod
     public void SetUp() throws IOException, ModelException {
-        project = createProjectWithColumns("UrlFetchingTests", "fruits");       
+        project = createProjectWithColumns("UrlFetchingTests", "fruits");
     }
 
     private void runAndWait(EngineDependentOperation op, int timeout) throws Exception {
@@ -123,19 +124,19 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
         Process process = op.createProcess(project, options);
         runAndWait(pm, process, timeout);
     }
-    
+
     @Test
     public void serializeColumnAdditionByFetchingURLsOperation() throws Exception {
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnAdditionByFetchingURLsOperation.class), json);
     }
-    
+
     @Test
     public void serializeUrlFetchingProcess() throws Exception {
         AbstractOperation op = ParsingUtilities.mapper.readValue(json, ColumnAdditionByFetchingURLsOperation.class);
         Process process = op.createProcess(project, new Properties());
         TestUtils.isSerializedTo(process, String.format(processJson, process.hashCode()));
     }
-    
+
     /**
      * Test for caching
      */
@@ -148,7 +149,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             Random rand = new Random();
             for (int i = 0; i < 100; i++) {
                 Row row = new Row(2);
-                row.setCell(0, new Cell(i < 5 ? "apple":"orange", null));
+                row.setCell(0, new Cell(i < 5 ? "apple" : "orange", null));
                 project.rows.add(row);
                 // We won't need them all, but queue 100 random responses
                 server.enqueue(new MockResponse().setBody(Integer.toString(rand.nextInt(100))));
@@ -170,7 +171,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             runAndWait(op, 1500);
 
             // Inspect rows
-            String ref_val = (String)project.rows.get(0).getCellValue(1).toString();
+            String ref_val = (String) project.rows.get(0).getCellValue(1).toString();
             Assert.assertFalse(ref_val.equals("apple")); // just to make sure I picked the right column
             for (int i = 1; i < 4; i++) {
                 // all random values should be equal due to caching
@@ -180,10 +181,8 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
         }
     }
 
-    
     /**
-     * Fetch invalid URLs
-     * https://github.com/OpenRefine/OpenRefine/issues/1219
+     * Fetch invalid URLs https://github.com/OpenRefine/OpenRefine/issues/1219
      */
     @Test
     public void testInvalidUrl() throws Exception {
@@ -233,7 +232,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             row0.setCell(0, new Cell(url.toString(), null));
             project.rows.add(row0);
 
-            String userAgentValue =  "OpenRefine";
+            String userAgentValue = "OpenRefine";
             String authorizationValue = "Basic";
             String acceptValue = "*/*";
             List<HttpHeader> headers = new ArrayList<>();
@@ -245,14 +244,14 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             server.enqueue(new MockResponse().setBody("second"));
 
             EngineDependentOperation op = new ColumnAdditionByFetchingURLsOperation(engine_config,
-                "fruits",
-                "value",
-                OnError.StoreError,
-                "junk",
-                1,
-                50,
-                true,
-                headers);
+                    "fruits",
+                    "value",
+                    OnError.StoreError,
+                    "junk",
+                    1,
+                    50,
+                    true,
+                    headers);
 
             runAndWait(op, 3000);
 
@@ -282,7 +281,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
                 server.enqueue(new MockResponse()
                         .setHeader("Retry-After", 1)
                         .setResponseCode(429)
-                        .setBody(Integer.toString(i,10)));
+                        .setBody(Integer.toString(i, 10)));
             }
 
             server.enqueue(new MockResponse().setBody("success"));
@@ -303,7 +302,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
 
             // Make sure that our Retry-After headers were obeyed (4*1 sec vs 4*100msec)
             long elapsed = System.currentTimeMillis() - start;
-            assertTrue(elapsed > 4000, "Retry-After retries didn't take long enough - elapsed = " + elapsed );
+            assertTrue(elapsed > 4000, "Retry-After retries didn't take long enough - elapsed = " + elapsed);
 
             // 1st row fails after 4 tries (3 retries), 2nd row tries twice and gets value
             assertTrue(project.rows.get(0).getCellValue(1).toString().contains("HTTP error 429"), "missing 429 error");
@@ -329,7 +328,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             for (int i = 0; i < 5; i++) {
                 server.enqueue(new MockResponse()
                         .setResponseCode(503)
-                        .setBody(Integer.toString(i,10)));
+                        .setBody(Integer.toString(i, 10)));
             }
             server.enqueue(new MockResponse().setBody("success"));
 
@@ -356,11 +355,10 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {
             // 1st row fails after 4 tries (3 retries), 2nd row tries twice and gets value, 3rd row is hard error
             assertTrue(project.rows.get(0).getCellValue(1).toString().contains("HTTP error 503"), "Missing 503 error");
             assertEquals(project.rows.get(1).getCellValue(1).toString(), "success");
-            assertTrue(project.rows.get(2).getCellValue(1).toString().contains("HTTP error 404"),"Missing 404 error");
+            assertTrue(project.rows.get(2).getCellValue(1).toString().contains("HTTP error 404"), "Missing 404 error");
 
             server.shutdown();
         }
     }
 
-
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java
index d4890945f..194ccf09f 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.column;
 
 import org.testng.annotations.BeforeSuite;
@@ -35,12 +36,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ColumnAdditionOperationTests extends RefineTest {
-    
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "column-addition", ColumnAdditionOperation.class);
     }
-    
+
     @Test
     public void serializeColumnAdditionOperation() throws Exception {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java
index ec78aa25a..2cb49dfa7 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.column;
 
 import org.testng.annotations.BeforeSuite;
@@ -35,12 +36,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ColumnMoveOperationTests extends RefineTest {
-    
+
     @BeforeSuite
     public void setUp() {
         OperationRegistry.registerOperation(getCoreModule(), "column-move", ColumnMoveOperation.class);
     }
-    
+
     @Test
     public void serializeColumnMoveOperation() throws Exception {
         String json = "{\"op\":\"core/column-move\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java
index 8e2d6e1be..1eb4180de 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.column;
 
 import org.testng.annotations.BeforeSuite;
@@ -34,14 +35,13 @@ import com.google.refine.operations.OperationRegistry;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class ColumnRemovalOperationTests extends RefineTest {
-    
+
     @BeforeSuite
     public void setUp() {
         OperationRegistry.registerOperation(getCoreModule(), "column-removal", ColumnRemovalOperation.class);
     }
-    
+
     @Test
     public void serializeColumnRemovalOperation() throws Exception {
         String json = "{\"op\":\"core/column-removal\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java
index 27cbed72e..21d95f954 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.column;
 
 import org.testng.annotations.BeforeSuite;
@@ -35,14 +36,13 @@ import com.google.refine.operations.OperationRegistry;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class ColumnRenameOperationTests extends RefineTest {
-    
+
     @BeforeSuite
     public void setUp() {
         OperationRegistry.registerOperation(getCoreModule(), "column-rename", ColumnRenameOperation.class);
     }
-    
+
     @Test
     public void serializeColumnRenameOperation() throws Exception {
         String json = "{\"op\":\"core/column-rename\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java
index 58b9ff785..8e1b1757d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.column;
 
 import java.util.Arrays;
@@ -41,7 +42,6 @@ import com.google.refine.operations.OperationRegistry;
 import com.google.refine.process.Process;
 import com.google.refine.util.TestUtils;
 
-
 public class ColumnReorderOperationTests extends RefineTest {
 
     Project project;
@@ -54,14 +54,14 @@ public class ColumnReorderOperationTests extends RefineTest {
     @BeforeMethod
     public void createProject() {
         project = createCSVProject(
-                        "a,b,c\n"+
-                        "1|2,d,e\n"+
+                "a,b,c\n" +
+                        "1|2,d,e\n" +
                         "3,f,g\n");
     }
 
     @Test
     public void serializeColumnReorderOperation() {
-        AbstractOperation op = new ColumnReorderOperation(Arrays.asList("b","c","a"));
+        AbstractOperation op = new ColumnReorderOperation(Arrays.asList("b", "c", "a"));
         TestUtils.isSerializedTo(op, "{\"op\":\"core/column-reorder\","
                 + "\"description\":\"Reorder columns\","
                 + "\"columnNames\":[\"b\",\"c\",\"a\"]}");
@@ -81,7 +81,6 @@ public class ColumnReorderOperationTests extends RefineTest {
         Assert.assertEquals(project.rows.get(1).getCellValue(bCol), "f");
         Assert.assertEquals(project.rows.get(1).getCellValue(cCol), "g");
 
-
         AbstractOperation op = new ColumnReorderOperation(Arrays.asList("a"));
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java
index 632bc4848..fd9c1f0b1 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.column;
 
 import org.testng.annotations.BeforeSuite;
@@ -35,45 +36,46 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ColumnSplitOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "column-split", ColumnSplitOperation.class);
     }
-    
+
     @Test
     public void serializeColumnSplitOperationBySeparator() throws Exception {
-        String json = "{\n" + 
-                "    \"op\": \"core/column-split\",\n" + 
-                "    \"description\": \"Split column ea by separator\",\n" + 
-                "    \"engineConfig\": {\n" + 
-                "      \"mode\": \"row-based\",\n" + 
-                "      \"facets\": []\n" + 
-                "    },\n" + 
-                "    \"columnName\": \"ea\",\n" + 
-                "    \"guessCellType\": true,\n" + 
-                "    \"removeOriginalColumn\": true,\n" + 
-                "    \"mode\": \"separator\",\n" + 
-                "    \"separator\": \"e\",\n" + 
-                "    \"regex\": false,\n" + 
-                "    \"maxColumns\": 0\n" + 
+        String json = "{\n" +
+                "    \"op\": \"core/column-split\",\n" +
+                "    \"description\": \"Split column ea by separator\",\n" +
+                "    \"engineConfig\": {\n" +
+                "      \"mode\": \"row-based\",\n" +
+                "      \"facets\": []\n" +
+                "    },\n" +
+                "    \"columnName\": \"ea\",\n" +
+                "    \"guessCellType\": true,\n" +
+                "    \"removeOriginalColumn\": true,\n" +
+                "    \"mode\": \"separator\",\n" +
+                "    \"separator\": \"e\",\n" +
+                "    \"regex\": false,\n" +
+                "    \"maxColumns\": 0\n" +
                 "  }";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnSplitOperation.class), json);
     }
-    
+
     @Test
     public void serializeColumnSplitOperationByLengths() throws Exception {
-        String json = "{\n" + 
-                "    \"op\": \"core/column-split\",\n" + 
-                "    \"description\": \"Split column ea by field lengths\",\n" + 
-                "    \"engineConfig\": {\n" + 
-                "      \"mode\": \"row-based\",\n" + 
-                "      \"facets\": []\n" + 
-                "    },\n" + 
-                "    \"columnName\": \"ea\",\n" + 
-                "    \"guessCellType\": true,\n" + 
-                "    \"removeOriginalColumn\": true,\n" + 
-                "    \"mode\": \"lengths\",\n" + 
-                "    \"fieldLengths\": [1,1]\n" + 
+        String json = "{\n" +
+                "    \"op\": \"core/column-split\",\n" +
+                "    \"description\": \"Split column ea by field lengths\",\n" +
+                "    \"engineConfig\": {\n" +
+                "      \"mode\": \"row-based\",\n" +
+                "      \"facets\": []\n" +
+                "    },\n" +
+                "    \"columnName\": \"ea\",\n" +
+                "    \"guessCellType\": true,\n" +
+                "    \"removeOriginalColumn\": true,\n" +
+                "    \"mode\": \"lengths\",\n" +
+                "    \"fieldLengths\": [1,1]\n" +
                 "  }";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnSplitOperation.class), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java
index c1cc3dc9c..78704e371 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java
@@ -33,12 +33,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.refine.operations.recon;
 
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -47,10 +47,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -77,14 +73,18 @@ import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-@PrepareForTest(ReconciledDataExtensionJob.class)
+import okhttp3.mockwebserver.Dispatcher;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
+
 public class ExtendDataOperationTests extends RefineTest {
 
     static final String ENGINE_JSON_URLS = "{\"mode\":\"row-based\"}}";
     static final String RECON_SERVICE = "https://tools.wmflabs.org/openrefine-wikidata/en/api";
     static final String RECON_IDENTIFIER_SPACE = "http://www.wikidata.org/entity/";
     static final String RECON_SCHEMA_SPACE = "http://www.wikidata.org/prop/direct/";
-    
+
     private String dataExtensionConfigJson = "{"
             + "    \"properties\":["
             + "        {\"name\":\"inception\",\"id\":\"P571\"},"
@@ -92,7 +92,7 @@ public class ExtendDataOperationTests extends RefineTest {
             + "        {\"name\":\"coordinate location\",\"id\":\"P625\"}"
             + "     ]"
             + "}";
-    
+
     private String operationJson = "{\"op\":\"core/extend-reconciled-data\","
             + "\"description\":\"Extend data at index 3 based on column organization_name\","
             + "\"engineConfig\":{\"mode\":\"row-based\",\"facets\":["
@@ -111,19 +111,20 @@ public class ExtendDataOperationTests extends RefineTest {
             + "        {\"name\":\"coordinate location\",\"id\":\"P625\"}"
             + "     ]"
             + "}}";
-    
+
     private String processJson = ""
-            + "    {\n" + 
-            "       \"description\" : \"Extend data at index 3 based on column organization_name\",\n" + 
-            "       \"id\" : %d,\n" + 
-            "       \"immediate\" : false,\n" + 
-            "       \"progress\" : 0,\n" + 
-            "       \"status\" : \"pending\"\n" + 
+            + "    {\n" +
+            "       \"description\" : \"Extend data at index 3 based on column organization_name\",\n" +
+            "       \"id\" : %d,\n" +
+            "       \"immediate\" : false,\n" +
+            "       \"progress\" : 0,\n" +
+            "       \"status\" : \"pending\"\n" +
             "     }";
-    
+
     private Map<JsonNode, String> mockedResponses = new HashMap<>();
-    
+
     static public class ReconciledDataExtensionJobStub extends ReconciledDataExtensionJob {
+
         public ReconciledDataExtensionJobStub(DataExtensionConfig obj, String endpoint) {
             super(obj, endpoint);
         }
@@ -147,19 +148,21 @@ public class ExtendDataOperationTests extends RefineTest {
     EngineConfig engine_config;
     Engine engine;
 
+    // HTTP mocking
+    Dispatcher dispatcher;
 
     @BeforeMethod
     public void SetUp() throws IOException, ModelException {
         OperationRegistry.registerOperation(getCoreModule(), "extend-reconciled-data", ExtendDataOperation.class);
         project = createProjectWithColumns("DataExtensionTests", "country");
-        
+
         options = mock(Properties.class);
         engine = new Engine(project);
         engine_config = EngineConfig.reconstruct(ENGINE_JSON_URLS);
         engine.initializeFromConfig(engine_config);
         engine.setMode(Engine.Mode.RowBased);
 
-               Row row = new Row(2);
+        Row row = new Row(2);
         row.setCell(0, reconciledCell("Iran", "Q794"));
         project.rows.add(row);
         row = new Row(2);
@@ -171,25 +174,45 @@ public class ExtendDataOperationTests extends RefineTest {
         row = new Row(2);
         row.setCell(0, reconciledCell("United States of America", "Q30"));
         project.rows.add(row);
+
+        dispatcher = new Dispatcher() {
+
+            @Override
+            public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
+                String json = URLDecoder.decode(request.getBody().readUtf8().split("=")[1], StandardCharsets.UTF_8);
+                JsonNode parsedQuery;
+                try {
+                    parsedQuery = ParsingUtilities.mapper.readTree(json);
+                } catch (IOException e) {
+                    throw new IllegalArgumentException("HTTP call with invalid JSON payload: " + json);
+                }
+                if (mockedResponses.containsKey(parsedQuery)) {
+                    return new MockResponse().setResponseCode(200).setBody(mockedResponses.get(parsedQuery));
+                } else {
+                    throw new IllegalArgumentException("HTTP call not mocked for query: " + json);
+                }
+            }
+
+        };
     }
-    
+
     @Test
     public void serializeExtendDataOperation() throws Exception {
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(operationJson, ExtendDataOperation.class), operationJson);
     }
-    
+
     @Test
     public void serializeExtendDataProcess() throws Exception {
         Process p = ParsingUtilities.mapper.readValue(operationJson, ExtendDataOperation.class)
                 .createProcess(project, new Properties());
         TestUtils.isSerializedTo(p, String.format(processJson, p.hashCode()));
     }
-    
+
     @Test
     public void serializeDataExtensionConfig() throws IOException {
         TestUtils.isSerializedTo(DataExtensionConfig.reconstruct(dataExtensionConfigJson), dataExtensionConfigJson);
     }
-    
+
     @Test
     public void testFormulateQuery() throws IOException {
         DataExtensionConfig config = DataExtensionConfig.reconstruct(dataExtensionConfigJson);
@@ -198,7 +221,6 @@ public class ExtendDataOperationTests extends RefineTest {
         ReconciledDataExtensionJobStub stub = new ReconciledDataExtensionJobStub(config, "http://endpoint");
         TestUtils.assertEqualsAsJson(stub.formulateQueryStub(ids, config), json);
     }
-   
 
     @AfterMethod
     public void TearDown() {
@@ -208,76 +230,65 @@ public class ExtendDataOperationTests extends RefineTest {
     }
 
     static public Cell reconciledCell(String name, String id) {
-       ReconCandidate r = new ReconCandidate(id, name, new String[0], 100);
-       List<ReconCandidate> candidates = new ArrayList<ReconCandidate>();
-       candidates.add(r);
-       Recon rec = new Recon(0, RECON_IDENTIFIER_SPACE, RECON_SCHEMA_SPACE);
-       rec.service = RECON_SERVICE;
-       rec.candidates = candidates;
-       rec.match = r;
-       return new Cell(name, rec);
-    }
-
-    /**
-     * Test to fetch simple strings
-     * @throws Exception 
-     */
-    @BeforeMethod
-    public void mockHttpCalls() throws Exception {
-    	mockStatic(ReconciledDataExtensionJob.class);
-    	PowerMockito.spy(ReconciledDataExtensionJob.class);
-    	Answer<String> mockedResponse = new Answer<String>() {
-			@Override
-			public String answer(InvocationOnMock invocation) throws Throwable {
-				return fakeHttpCall(invocation.getArgument(0), invocation.getArgument(1));
-			}
-    	};
-    	PowerMockito.doAnswer(mockedResponse).when(ReconciledDataExtensionJob.class, "postExtendQuery", anyString(), anyString());
+        ReconCandidate r = new ReconCandidate(id, name, new String[0], 100);
+        List<ReconCandidate> candidates = new ArrayList<ReconCandidate>();
+        candidates.add(r);
+        Recon rec = new Recon(0, RECON_IDENTIFIER_SPACE, RECON_SCHEMA_SPACE);
+        rec.service = RECON_SERVICE;
+        rec.candidates = candidates;
+        rec.match = r;
+        return new Cell(name, rec);
     }
 
     @AfterMethod
     public void cleanupHttpMocks() {
-    	mockedResponses.clear();
+        mockedResponses.clear();
     }
 
     @Test
     public void testFetchStrings() throws Exception {
-  
-        DataExtensionConfig extension = DataExtensionConfig.reconstruct("{\"properties\":[{\"id\":\"P297\",\"name\":\"ISO 3166-1 alpha-2 code\"}]}");
-        
-        mockHttpCall("{\"ids\":[\"Q863\",\"Q794\",\"Q17\",\"Q30\"],\"properties\":[{\"id\":\"P297\"}]}",
-      		  "{"
-  			+ "\"rows\": {"
-  			+ "    \"Q794\": {\"P297\": [{\"str\": \"IR\"}]},"
-  			+ "    \"Q863\": {\"P297\": []},"
-  			+ "    \"Q30\": {\"P297\": [{\"str\": \"US\"}]},"
-  			+ "    \"Q17\": {\"P297\": [{\"str\": \"JP\"}]}"
-  			+ "},"
-  			+ "\"meta\": ["
-  			+ "   {\"name\": \"ISO 3166-1 alpha-2 code\", \"id\": \"P297\"}"
-  			+ "]}");
-        
-        EngineDependentOperation op = new ExtendDataOperation(engine_config,
-                "country",
-                RECON_SERVICE,
-                RECON_IDENTIFIER_SPACE,
-                RECON_SCHEMA_SPACE,
-                extension,
-                1);
-        LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
-        process.run();
 
-        // Inspect rows
-        Assert.assertTrue("IR".equals(project.rows.get(0).getCellValue(1)), "Bad country code for Iran.");
-        Assert.assertTrue("JP".equals(project.rows.get(1).getCellValue(1)), "Bad country code for Japan.");
-        Assert.assertNull(project.rows.get(2).getCell(1), "Expected a null country code.");
-        Assert.assertTrue("US".equals(project.rows.get(3).getCellValue(1)), "Bad country code for United States.");
+        DataExtensionConfig extension = DataExtensionConfig
+                .reconstruct("{\"properties\":[{\"id\":\"P297\",\"name\":\"ISO 3166-1 alpha-2 code\"}]}");
 
-        // Make sure we did not create any recon stats for that column (no reconciled value)
-        Assert.assertTrue(project.columnModel.getColumnByName("ISO 3166-1 alpha-2 code").getReconStats() == null);
+        try (MockWebServer server = new MockWebServer()) {
+            server.start();
+            server.setDispatcher(dispatcher);
+
+            mockHttpCall("{\"ids\":[\"Q863\",\"Q794\",\"Q17\",\"Q30\"],\"properties\":[{\"id\":\"P297\"}]}",
+                    "{"
+                            + "\"rows\": {"
+                            + "    \"Q794\": {\"P297\": [{\"str\": \"IR\"}]},"
+                            + "    \"Q863\": {\"P297\": []},"
+                            + "    \"Q30\": {\"P297\": [{\"str\": \"US\"}]},"
+                            + "    \"Q17\": {\"P297\": [{\"str\": \"JP\"}]}"
+                            + "},"
+                            + "\"meta\": ["
+                            + "   {\"name\": \"ISO 3166-1 alpha-2 code\", \"id\": \"P297\"}"
+                            + "]}");
+
+            EngineDependentOperation op = new ExtendDataOperation(engine_config,
+                    "country",
+                    server.url("/reconcile").url().toString(),
+                    RECON_IDENTIFIER_SPACE,
+                    RECON_SCHEMA_SPACE,
+                    extension,
+                    1);
+            LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
+            process.run();
+
+            // Inspect rows
+            Assert.assertTrue("IR".equals(project.rows.get(0).getCellValue(1)), "Bad country code for Iran.");
+            Assert.assertTrue("JP".equals(project.rows.get(1).getCellValue(1)), "Bad country code for Japan.");
+            Assert.assertNull(project.rows.get(2).getCell(1), "Expected a null country code.");
+            Assert.assertTrue("US".equals(project.rows.get(3).getCellValue(1)), "Bad country code for United States.");
+
+            // Make sure we did not create any recon stats for that column (no reconciled value)
+            Assert.assertTrue(project.columnModel.getColumnByName("ISO 3166-1 alpha-2 code").getReconStats() == null);
+        }
     }
 
-     /**
+    /**
      * Test to fetch counts of values
      */
 
@@ -285,36 +296,44 @@ public class ExtendDataOperationTests extends RefineTest {
     public void testFetchCounts() throws Exception {
         DataExtensionConfig extension = DataExtensionConfig.reconstruct(
                 "{\"properties\":[{\"id\":\"P38\",\"name\":\"currency\",\"settings\":{\"count\":\"on\",\"rank\":\"any\"}}]}");
-        
-        mockHttpCall("{\"ids\":[\"Q863\",\"Q794\",\"Q17\",\"Q30\"],\"properties\":[{\"id\":\"P38\",\"settings\":{\"count\":\"on\",\"rank\":\"any\"}}]}",
-        		"{"
-        		+ "\"rows\": {"
-        		+ "    \"Q794\": {\"P38\": [{\"float\": 1}]},"
-        		+ "    \"Q863\": {\"P38\": [{\"float\": 2}]},"
-        		+ "    \"Q30\": {\"P38\": [{\"float\": 1}]},"
-        		+ "    \"Q17\": {\"P38\": [{\"float\": 1}]}"
-        		+ "},"
-        		+ "\"meta\": ["
-        		+ "    {\"settings\": {\"count\": \"on\", \"rank\": \"any\"}, \"name\": \"currency\", \"id\": \"P38\"}"
-        		+ "]}");
-        
-        EngineDependentOperation op = new ExtendDataOperation(engine_config,
-                "country",
-                RECON_SERVICE,
-                RECON_IDENTIFIER_SPACE,
-                RECON_SCHEMA_SPACE,
-                extension,
-                1);
-        
-        LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
-        process.run();
 
-        // Test to be updated as countries change currencies!
-        Assert.assertTrue(Math.round((double)project.rows.get(2).getCellValue(1)) == 2, "Incorrect number of currencies returned for Tajikistan.");
-        Assert.assertTrue(Math.round((double)project.rows.get(3).getCellValue(1)) == 1, "Incorrect number of currencies returned for United States.");
+        mockHttpCall(
+                "{\"ids\":[\"Q863\",\"Q794\",\"Q17\",\"Q30\"],\"properties\":[{\"id\":\"P38\",\"settings\":{\"count\":\"on\",\"rank\":\"any\"}}]}",
+                "{"
+                        + "\"rows\": {"
+                        + "    \"Q794\": {\"P38\": [{\"float\": 1}]},"
+                        + "    \"Q863\": {\"P38\": [{\"float\": 2}]},"
+                        + "    \"Q30\": {\"P38\": [{\"float\": 1}]},"
+                        + "    \"Q17\": {\"P38\": [{\"float\": 1}]}"
+                        + "},"
+                        + "\"meta\": ["
+                        + "    {\"settings\": {\"count\": \"on\", \"rank\": \"any\"}, \"name\": \"currency\", \"id\": \"P38\"}"
+                        + "]}");
 
-        // Make sure we did not create any recon stats for that column (no reconciled value)
-        Assert.assertTrue(project.columnModel.getColumnByName("currency").getReconStats() == null);
+        try (MockWebServer server = new MockWebServer()) {
+            server.start();
+            server.setDispatcher(dispatcher);
+
+            EngineDependentOperation op = new ExtendDataOperation(engine_config,
+                    "country",
+                    server.url("/reconcile").url().toString(),
+                    RECON_IDENTIFIER_SPACE,
+                    RECON_SCHEMA_SPACE,
+                    extension,
+                    1);
+
+            LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
+            process.run();
+
+            // Test to be updated as countries change currencies!
+            Assert.assertTrue(Math.round((double) project.rows.get(2).getCellValue(1)) == 2,
+                    "Incorrect number of currencies returned for Tajikistan.");
+            Assert.assertTrue(Math.round((double) project.rows.get(3).getCellValue(1)) == 1,
+                    "Incorrect number of currencies returned for United States.");
+
+            // Make sure we did not create any recon stats for that column (no reconciled value)
+            Assert.assertTrue(project.columnModel.getColumnByName("currency").getReconStats() == null);
+        }
     }
 
     /**
@@ -324,39 +343,43 @@ public class ExtendDataOperationTests extends RefineTest {
     public void testFetchCurrent() throws Exception {
         DataExtensionConfig extension = DataExtensionConfig.reconstruct(
                 "{\"properties\":[{\"id\":\"P38\",\"name\":\"currency\",\"settings\":{\"rank\":\"best\"}}]}");
-        
+
         mockHttpCall("{\"ids\":[\"Q863\",\"Q794\",\"Q17\",\"Q30\"],\"properties\":[{\"id\":\"P38\",\"settings\":{\"rank\":\"best\"}}]}",
-        		"{\"rows\":{"
-        		+ "   \"Q794\": {\"P38\": [{\"name\": \"Iranian rial\", \"id\": \"Q188608\"}]},"
-        		+ "   \"Q863\": {\"P38\": [{\"name\": \"Tajikistani somoni\", \"id\": \"Q199886\"}]},"
-        		+ "   \"Q30\": {\"P38\": [{\"name\": \"United States dollar\", \"id\": \"Q4917\"}]},"
-        		+ "   \"Q17\": {\"P38\": [{\"name\": \"Japanese yen\", \"id\": \"Q8146\"}]}"
-        		+ "}, \"meta\": ["
-        		+ "     {\"settings\": {\"rank\": \"best\"}, \"name\": \"currency\", \"id\": \"P38\"}"
-        		+ "]}");
-        
-        EngineDependentOperation op = new ExtendDataOperation(engine_config,
-                "country",
-                RECON_SERVICE,
-                RECON_IDENTIFIER_SPACE,
-                RECON_SCHEMA_SPACE,
-                extension,
-                1);
-        LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
-        process.run();
+                "{\"rows\":{"
+                        + "   \"Q794\": {\"P38\": [{\"name\": \"Iranian rial\", \"id\": \"Q188608\"}]},"
+                        + "   \"Q863\": {\"P38\": [{\"name\": \"Tajikistani somoni\", \"id\": \"Q199886\"}]},"
+                        + "   \"Q30\": {\"P38\": [{\"name\": \"United States dollar\", \"id\": \"Q4917\"}]},"
+                        + "   \"Q17\": {\"P38\": [{\"name\": \"Japanese yen\", \"id\": \"Q8146\"}]}"
+                        + "}, \"meta\": ["
+                        + "     {\"settings\": {\"rank\": \"best\"}, \"name\": \"currency\", \"id\": \"P38\"}"
+                        + "]}");
 
-        /*
-          * Tajikistan has one "preferred" currency and one "normal" one
-          * (in terms of statement ranks).
-          * But thanks to our setting in the extension configuration,
-          * we only fetch the current one, so the one just after it is
-          * the one for the US (USD).
-          */
-        Assert.assertTrue("Tajikistani somoni".equals(project.rows.get(2).getCellValue(1)));
-        Assert.assertTrue("United States dollar".equals(project.rows.get(3).getCellValue(1)));
+        try (MockWebServer server = new MockWebServer()) {
+            server.start();
+            server.setDispatcher(dispatcher);
 
-        // Make sure all the values are reconciled
-        Assert.assertTrue(project.columnModel.getColumnByName("currency").getReconStats().matchedTopics == 4);
+            EngineDependentOperation op = new ExtendDataOperation(engine_config,
+                    "country",
+                    server.url("/reconcile").url().toString(),
+                    RECON_IDENTIFIER_SPACE,
+                    RECON_SCHEMA_SPACE,
+                    extension,
+                    1);
+
+            LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
+            process.run();
+
+            /*
+             * Tajikistan has one "preferred" currency and one "normal" one (in terms of statement ranks). But thanks to
+             * our setting in the extension configuration, we only fetch the current one, so the one just after it is
+             * the one for the US (USD).
+             */
+            Assert.assertTrue("Tajikistani somoni".equals(project.rows.get(2).getCellValue(1)));
+            Assert.assertTrue("United States dollar".equals(project.rows.get(3).getCellValue(1)));
+
+            // Make sure all the values are reconciled
+            Assert.assertTrue(project.columnModel.getColumnByName("currency").getReconStats().matchedTopics == 4);
+        }
     }
 
     /**
@@ -366,40 +389,44 @@ public class ExtendDataOperationTests extends RefineTest {
     public void testFetchRecord() throws Exception {
         DataExtensionConfig extension = DataExtensionConfig.reconstruct(
                 "{\"properties\":[{\"id\":\"P38\",\"name\":\"currency\",\"settings\":{\"rank\":\"any\"}}]}");
-        
+
         mockHttpCall("{\"ids\":[\"Q863\",\"Q794\",\"Q17\",\"Q30\"],\"properties\":[{\"id\":\"P38\",\"settings\":{\"rank\":\"any\"}}]}",
-    			"{\"rows\": {"
-    			+ "   \"Q794\": {\"P38\": [{\"name\": \"Iranian rial\", \"id\": \"Q188608\"}]},"
-    			+ "   \"Q863\": {\"P38\": [{\"name\": \"Tajikistani somoni\", \"id\": \"Q199886\"}, {\"name\": \"Tajikistani ruble\", \"id\": \"Q2423956\"}]},"
-    			+ "   \"Q30\": {\"P38\": [{\"name\": \"United States dollar\", \"id\": \"Q4917\"}]},"
-    			+ "   \"Q17\": {\"P38\": [{\"name\": \"Japanese yen\", \"id\": \"Q8146\"}]}"
-    			+ "},"
-    			+ "\"meta\": ["
-    			+ "    {\"settings\": {\"rank\": \"any\"}, \"name\": \"currency\", \"id\": \"P38\"}"
-    			+ "]}");
-        
-        EngineDependentOperation op = new ExtendDataOperation(engine_config,
-                "country",
-                RECON_SERVICE,
-                RECON_IDENTIFIER_SPACE,
-                RECON_SCHEMA_SPACE,
-                extension,
-                1);
-        LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
-        process.run();
+                "{\"rows\": {"
+                        + "   \"Q794\": {\"P38\": [{\"name\": \"Iranian rial\", \"id\": \"Q188608\"}]},"
+                        + "   \"Q863\": {\"P38\": [{\"name\": \"Tajikistani somoni\", \"id\": \"Q199886\"}, {\"name\": \"Tajikistani ruble\", \"id\": \"Q2423956\"}]},"
+                        + "   \"Q30\": {\"P38\": [{\"name\": \"United States dollar\", \"id\": \"Q4917\"}]},"
+                        + "   \"Q17\": {\"P38\": [{\"name\": \"Japanese yen\", \"id\": \"Q8146\"}]}"
+                        + "},"
+                        + "\"meta\": ["
+                        + "    {\"settings\": {\"rank\": \"any\"}, \"name\": \"currency\", \"id\": \"P38\"}"
+                        + "]}");
 
-        /*
-          * Tajikistan has one "preferred" currency and one "normal" one
-          * (in terms of statement ranks).
-          * The second currency is fetched as well, which creates a record
-          * (the cell to the left of it is left blank).
-          */
-        Assert.assertTrue("Tajikistani somoni".equals(project.rows.get(2).getCellValue(1)), "Bad currency name for Tajikistan");
-        Assert.assertTrue("Tajikistani ruble".equals(project.rows.get(3).getCellValue(1)), "Bad currency name for Tajikistan");
-        Assert.assertTrue(null == project.rows.get(3).getCellValue(0));
+        try (MockWebServer server = new MockWebServer()) {
+            server.start();
+            server.setDispatcher(dispatcher);
 
-        // Make sure all the values are reconciled
-        Assert.assertTrue(project.columnModel.getColumnByName("currency").getReconStats().matchedTopics == 5);
+            EngineDependentOperation op = new ExtendDataOperation(engine_config,
+                    "country",
+                    server.url("/reconcile").url().toString(),
+                    RECON_IDENTIFIER_SPACE,
+                    RECON_SCHEMA_SPACE,
+                    extension,
+                    1);
+
+            LongRunningProcessStub process = new LongRunningProcessStub(op.createProcess(project, options));
+            process.run();
+
+            /*
+             * Tajikistan has one "preferred" currency and one "normal" one (in terms of statement ranks). The second
+             * currency is fetched as well, which creates a record (the cell to the left of it is left blank).
+             */
+            Assert.assertTrue("Tajikistani somoni".equals(project.rows.get(2).getCellValue(1)), "Bad currency name for Tajikistan");
+            Assert.assertTrue("Tajikistani ruble".equals(project.rows.get(3).getCellValue(1)), "Bad currency name for Tajikistan");
+            Assert.assertTrue(null == project.rows.get(3).getCellValue(0));
+
+            // Make sure all the values are reconciled
+            Assert.assertTrue(project.columnModel.getColumnByName("currency").getReconStats().matchedTopics == 5);
+        }
     }
 
     private void mockHttpCall(String query, String response) throws IOException {
@@ -407,11 +434,11 @@ public class ExtendDataOperationTests extends RefineTest {
     }
 
     String fakeHttpCall(String endpoint, String query) throws IOException {
-    	  JsonNode parsedQuery = ParsingUtilities.mapper.readTree(query);
-    	  if (mockedResponses.containsKey(parsedQuery)) {
-    		    return mockedResponses.get(parsedQuery);
-    	  } else {
-    		    throw new IllegalArgumentException("HTTP call not mocked for query: "+query);
-    	  }
+        JsonNode parsedQuery = ParsingUtilities.mapper.readTree(query);
+        if (mockedResponses.containsKey(parsedQuery)) {
+            return mockedResponses.get(parsedQuery);
+        } else {
+            throw new IllegalArgumentException("HTTP call not mocked for query: " + query);
+        }
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java
index aca949344..021cd3029 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconClearSimilarCellsOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,11 +37,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconClearSimilarCellsOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-clear-similar-cells", ReconClearSimilarCellsOperation.class);
     }
-    
+
     @Test
     public void serializeReconClearSimilarCellsOperation() throws Exception {
         String json = "{\"op\":\"core/recon-clear-similar-cells\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java
index 33a73fa81..14f07a635 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconCopyAcrossColumnsOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,11 +37,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconCopyAcrossColumnsOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-copy-across-columns", ReconCopyAcrossColumnsOperation.class);
     }
-    
+
     @Test
     public void serializeReconCopyAcrossColumnsOperation() throws Exception {
         String json = "{\"op\":\"core/recon-copy-across-columns\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java
index 6c733fc97..39190df3d 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconDiscardJudgmentsOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,22 +37,23 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconDiscardJudgmentsOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-discard-judgments", ReconDiscardJudgmentsOperation.class);
     }
-    
+
     @Test
     public void serializeReconDiscardJudgmentsOperation() throws Exception {
-        String json = "{\n" + 
-                "    \"op\": \"core/recon-discard-judgments\",\n" + 
-                "    \"description\": \"Discard recon judgments and clear recon data for cells in column researcher\",\n" + 
-                "    \"engineConfig\": {\n" + 
-                "      \"mode\": \"record-based\",\n" + 
-                "      \"facets\": []\n" + 
-                "    },\n" + 
-                "    \"columnName\": \"researcher\",\n" + 
-                "    \"clearData\": true\n" + 
+        String json = "{\n" +
+                "    \"op\": \"core/recon-discard-judgments\",\n" +
+                "    \"description\": \"Discard recon judgments and clear recon data for cells in column researcher\",\n" +
+                "    \"engineConfig\": {\n" +
+                "      \"mode\": \"record-based\",\n" +
+                "      \"facets\": []\n" +
+                "    },\n" +
+                "    \"columnName\": \"researcher\",\n" +
+                "    \"clearData\": true\n" +
                 "  }";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ReconDiscardJudgmentsOperation.class), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java
index 411c406d1..32edec521 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,11 +37,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconJudgeSimilarCellsOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-judge-similar-cells", ReconJudgeSimilarCellsOperation.class);
     }
-    
+
     @Test
     public void serializeReconJudgeSimilarCellsOperation() throws Exception {
         String json = "{\"op\":\"core/recon-judge-similar-cells\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java
index 959e30a11..b651c8938 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
 
 import static org.testng.Assert.assertEquals;
@@ -53,18 +54,18 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconJudgeSimilarCellsTests extends RefineTest {
-    
+
     static final EngineConfig ENGINE_CONFIG = EngineConfig.reconstruct("{\"mode\":\"row-based\"}}");
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
         OperationRegistry.registerOperation(getCoreModule(), "recon-judge-similar-cells", ReconJudgeSimilarCellsOperation.class);
     }
-    
+
     @Test
-    public void serializeReconJudgeSimilarCellsOperation() throws  IOException {
+    public void serializeReconJudgeSimilarCellsOperation() throws IOException {
         String json = "{\"op\":\"core/recon-judge-similar-cells\","
                 + "\"description\":\"Mark to create one single new item for all cells containing \\\"foo\\\" in column A\","
                 + "\"engineConfig\":{\"mode\":\"row-based\",\"facets\":[]},"
@@ -74,9 +75,9 @@ public class ReconJudgeSimilarCellsTests extends RefineTest {
                 + "\"shareNewTopics\":true}";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ReconJudgeSimilarCellsOperation.class), json);
     }
-    
+
     @Test
-    public void serializeReconJudgeSimilarCellsOperationMatch() throws  IOException {
+    public void serializeReconJudgeSimilarCellsOperationMatch() throws IOException {
         String json = "{\"op\":\"core/recon-judge-similar-cells\","
                 + "\"description\":\"Match item Douglas Adams (Q42) for cells containing \\\"foo\\\" in column A\","
                 + "\"engineConfig\":{\"mode\":\"row-based\",\"facets\":[]},"
@@ -88,14 +89,14 @@ public class ReconJudgeSimilarCellsTests extends RefineTest {
                 + "}";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ReconJudgeSimilarCellsOperation.class), json);
     }
-    
+
     @Test
     public void testMarkNewTopics() throws Exception {
         Project project = createCSVProject(
                 "A,B\n"
-              + "foo,bar\n"
-              + "alpha,beta\n");
-        
+                        + "foo,bar\n"
+                        + "alpha,beta\n");
+
         Column column = project.columnModel.columns.get(0);
         ReconConfig config = new StandardReconConfig(
                 "http://my.database/recon_service",
@@ -107,14 +108,14 @@ public class ReconJudgeSimilarCellsTests extends RefineTest {
         column.setReconConfig(config);
 
         AbstractOperation op = new ReconJudgeSimilarCellsOperation(
-            ENGINE_CONFIG,
-            "A",
-            "foo",
-            Recon.Judgment.New,
-            null, true);
+                ENGINE_CONFIG,
+                "A",
+                "foo",
+                Recon.Judgment.New,
+                null, true);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Cell cell = project.rows.get(0).cells.get(0);
         assertEquals(Recon.Judgment.New, cell.recon.judgment);
         assertEquals("http://my.database/entity/", cell.recon.identifierSpace);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java
index 582900c77..e77a85601 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,11 +37,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconMarkNewTopicsOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-mark-new-topics", ReconMarkNewTopicsOperation.class);
     }
-    
+
     @Test
     public void serializeReconMarkNewTopicsOperation() throws Exception {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java
index 3b5798b9d..fcade4747 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchBestCandidatesOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,11 +37,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconMatchBestCandidatesOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-match-best-candidates", ReconMatchBestCandidatesOperation.class);
     }
-    
+
     @Test
     public void serializeReconMatchBestCandidatesOperation() throws Exception {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java
index 2db14b5da..6d5d1f682 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperationTests.java
@@ -24,7 +24,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
+
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
@@ -35,30 +37,31 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ReconMatchSpecificTopicOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-match-specific-topic-to-cells", ReconMatchSpecificTopicOperation.class);
     }
-    
+
     @Test
     public void serializeReconMatchSpecificTopicOperation() throws Exception {
-        String json = "{\n" + 
-                "    \"op\": \"core/recon-match-specific-topic-to-cells\",\n" + 
-                "    \"description\": \"Match specific item Gangnam (Q489941) to cells in column researcher\",\n" + 
-                "    \"engineConfig\": {\n" + 
-                "      \"mode\": \"record-based\",\n" + 
-                "      \"facets\": []\n" + 
-                "    },\n" + 
-                "    \"columnName\": \"researcher\",\n" + 
-                "    \"match\": {\n" + 
-                "      \"id\": \"Q489941\",\n" + 
-                "      \"name\": \"Gangnam\",\n" + 
-                "      \"types\": [\n" + 
-                "        \"Q5\"\n" + 
-                "      ]\n" + 
-                "    },\n" + 
-                "    \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" + 
-                "    \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\"\n" + 
+        String json = "{\n" +
+                "    \"op\": \"core/recon-match-specific-topic-to-cells\",\n" +
+                "    \"description\": \"Match specific item Gangnam (Q489941) to cells in column researcher\",\n" +
+                "    \"engineConfig\": {\n" +
+                "      \"mode\": \"record-based\",\n" +
+                "      \"facets\": []\n" +
+                "    },\n" +
+                "    \"columnName\": \"researcher\",\n" +
+                "    \"match\": {\n" +
+                "      \"id\": \"Q489941\",\n" +
+                "      \"name\": \"Gangnam\",\n" +
+                "      \"types\": [\n" +
+                "        \"Q5\"\n" +
+                "      ]\n" +
+                "    },\n" +
+                "    \"identifierSpace\": \"http://www.wikidata.org/entity/\",\n" +
+                "    \"schemaSpace\": \"http://www.wikidata.org/prop/direct/\"\n" +
                 "  }";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ReconMatchSpecificTopicOperation.class), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java
index c199afc8e..1e0f9ec9a 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
 
 import static org.mockito.Mockito.mock;
@@ -53,9 +54,9 @@ import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class ReconOperationTests extends RefineTest {
-    private String json= "{"
+
+    private String json = "{"
             + "\"op\":\"core/recon\","
             + "\"description\":\"Reconcile cells in column researcher to type Q5\","
             + "\"columnName\":\"researcher\","
@@ -70,49 +71,49 @@ public class ReconOperationTests extends RefineTest {
             + "   \"limit\":0"
             + "},"
             + "\"engineConfig\":{\"mode\":\"row-based\",\"facets\":[]}}";
-    
+
     private String processJson = ""
-            + "    {\n" + 
-            "       \"description\" : \"Reconcile cells in column researcher to type Q5\",\n" + 
-            "       \"id\" : %d,\n" + 
-            "       \"immediate\" : false,\n" + 
-            "       \"onDone\" : [ {\n" + 
-            "         \"action\" : \"createFacet\",\n" + 
-            "         \"facetConfig\" : {\n" + 
-            "           \"columnName\" : \"researcher\",\n" + 
-            "           \"expression\" : \"forNonBlank(cell.recon.judgment, v, v, if(isNonBlank(value), \\\"(unreconciled)\\\", \\\"(blank)\\\"))\",\n" + 
-            "           \"name\" : \"researcher: judgment\"\n" + 
-            "         },\n" + 
-            "         \"facetOptions\" : {\n" + 
-            "           \"scroll\" : false\n" + 
-            "         },\n" + 
-            "         \"facetType\" : \"list\"\n" + 
-            "       }, {\n" + 
-            "         \"action\" : \"createFacet\",\n" + 
-            "         \"facetConfig\" : {\n" + 
-            "           \"columnName\" : \"researcher\",\n" + 
-            "           \"expression\" : \"cell.recon.best.score\",\n" + 
-            "           \"mode\" : \"range\",\n" + 
-            "           \"name\" : \"researcher: best candidate's score\"\n" + 
-            "         },\n" + 
-            "         \"facetType\" : \"range\"\n" + 
-            "       } ],\n" + 
-            "       \"progress\" : 0,\n" + 
-            "       \"status\" : \"pending\"\n" + 
+            + "    {\n" +
+            "       \"description\" : \"Reconcile cells in column researcher to type Q5\",\n" +
+            "       \"id\" : %d,\n" +
+            "       \"immediate\" : false,\n" +
+            "       \"onDone\" : [ {\n" +
+            "         \"action\" : \"createFacet\",\n" +
+            "         \"facetConfig\" : {\n" +
+            "           \"columnName\" : \"researcher\",\n" +
+            "           \"expression\" : \"forNonBlank(cell.recon.judgment, v, v, if(isNonBlank(value), \\\"(unreconciled)\\\", \\\"(blank)\\\"))\",\n"
+            +
+            "           \"name\" : \"researcher: judgment\"\n" +
+            "         },\n" +
+            "         \"facetOptions\" : {\n" +
+            "           \"scroll\" : false\n" +
+            "         },\n" +
+            "         \"facetType\" : \"list\"\n" +
+            "       }, {\n" +
+            "         \"action\" : \"createFacet\",\n" +
+            "         \"facetConfig\" : {\n" +
+            "           \"columnName\" : \"researcher\",\n" +
+            "           \"expression\" : \"cell.recon.best.score\",\n" +
+            "           \"mode\" : \"range\",\n" +
+            "           \"name\" : \"researcher: best candidate's score\"\n" +
+            "         },\n" +
+            "         \"facetType\" : \"range\"\n" +
+            "       } ],\n" +
+            "       \"progress\" : 0,\n" +
+            "       \"status\" : \"pending\"\n" +
             "     }";
-    
 
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon", ReconOperation.class);
         ReconConfig.registerReconConfig(getCoreModule(), "standard-service", StandardReconConfig.class);
     }
-    
+
     @Test
     public void serializeReconOperation() throws Exception {
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ReconOperation.class), json);
     }
-    
+
     @Test
     public void serializeReconProcess() throws Exception {
         ReconOperation op = ParsingUtilities.mapper.readValue(json, ReconOperation.class);
@@ -120,33 +121,33 @@ public class ReconOperationTests extends RefineTest {
         Process process = op.createProcess(project, new Properties());
         TestUtils.isSerializedTo(process, String.format(processJson, process.hashCode()));
     }
-    
+
     @Test
     public void testFailingRecon() throws Exception {
         Project project = createCSVProject("my recon test project",
                 "column\n"
-              + "valueA\n"
-              + "valueB\n"
-              + "valueC");
+                        + "valueA\n"
+                        + "valueB\n"
+                        + "valueC");
         StandardReconConfig reconConfig = mock(StandardReconConfig.class);
-        List<Recon> reconList = Arrays.asList((Recon)null, (Recon)null, (Recon)null);
+        List<Recon> reconList = Arrays.asList((Recon) null, (Recon) null, (Recon) null);
         ReconJob reconJob = mock(ReconJob.class);
         when(reconConfig.batchRecon(Mockito.any(), Mockito.anyLong())).thenReturn(reconList);
         when(reconConfig.getBatchSize()).thenReturn(10);
         when(reconConfig.createJob(Mockito.eq(project), Mockito.anyInt(), Mockito.any(), Mockito.any(), Mockito.any()))
-            .thenReturn(reconJob);
-          
+                .thenReturn(reconJob);
+
         ReconOperation op = new ReconOperation(EngineConfig.reconstruct("{}"), "column", reconConfig);
-            
+
         Process process = op.createProcess(project, new Properties());
         runAndWait(project.getProcessManager(), process, 1000);
-        
+
         Column column = project.columnModel.columns.get(0);
         Assert.assertNotNull(column.getReconStats());
         Assert.assertEquals(column.getReconStats().matchedTopics, 0);
-        
+
         Assert.assertNull(project.rows.get(0).getCell(0).recon);
         Assert.assertNull(project.rows.get(1).getCell(0).recon);
         Assert.assertNull(project.rows.get(2).getCell(0).recon);
-       }
+    }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.java
index 435063f9f..bb3804cd1 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/recon/ReconUseValuesAsIdsOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.recon;
 
 import static org.testng.Assert.assertEquals;
@@ -42,8 +43,8 @@ import com.google.refine.operations.recon.ReconUseValuesAsIdentifiersOperation;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
-
 public class ReconUseValuesAsIdsOperationTests extends RefineTest {
+
     String json = "{"
             + "\"op\":\"core/recon-use-values-as-identifiers\","
             + "\"description\":\"Use values as reconciliation identifiers in column ids\","
@@ -53,17 +54,17 @@ public class ReconUseValuesAsIdsOperationTests extends RefineTest {
             + "\"identifierSpace\":\"http://test.org/entities/\","
             + "\"schemaSpace\":\"http://test.org/schema/\""
             + "}";
-    
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "recon-use-values-as-identifiers", ReconUseValuesAsIdentifiersOperation.class);
     }
-    
+
     @Test
     public void serializeReconUseValuesAsIdentifiersOperation() throws Exception {
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ReconUseValuesAsIdentifiersOperation.class), json);
     }
-    
+
     @Test
     public void testUseValuesAsIds() throws Exception {
         Project project = createCSVProject("ids,v\n"
@@ -72,12 +73,12 @@ public class ReconUseValuesAsIdsOperationTests extends RefineTest {
                 + "http://test.org/entities/Q31,test");
         ReconUseValuesAsIdentifiersOperation op = ParsingUtilities.mapper.readValue(json, ReconUseValuesAsIdentifiersOperation.class);
         op.createProcess(project, new Properties()).performImmediate();
-        
+
         assertEquals("Q343", project.rows.get(0).cells.get(0).recon.match.id);
         assertEquals("http://test.org/entities/", project.rows.get(0).cells.get(0).recon.identifierSpace);
         assertNull(project.rows.get(1).cells.get(0));
         assertEquals("Q31", project.rows.get(2).cells.get(0).recon.match.id);
         assertEquals(2, project.columnModel.columns.get(0).getReconStats().matchedTopics);
-        assertEquals("http://test.org/schema/", ((StandardReconConfig)project.columnModel.columns.get(0).getReconConfig()).schemaSpace);
+        assertEquals("http://test.org/schema/", ((StandardReconConfig) project.columnModel.columns.get(0).getReconConfig()).schemaSpace);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java
index 532364381..ce2407791 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/DenormalizeOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.row;
 
 import org.testng.annotations.BeforeSuite;
@@ -33,13 +34,13 @@ import com.google.refine.RefineTest;
 import com.google.refine.operations.OperationRegistry;
 import com.google.refine.util.TestUtils;
 
-
 public class DenormalizeOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "denormalize", DenormalizeOperation.class);
     }
-    
+
     @Test
     public void serializeDenormalizeOperation() throws Exception {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java
index c0ef74353..230c96e76 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowFlagOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.row;
 
 import org.testng.annotations.BeforeSuite;
@@ -35,11 +36,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class RowFlagOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "row-flag", RowFlagOperation.class);
     }
-    
+
     @Test
     public void serializeRowFlagOperation() throws Exception {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java
index 6e14fa666..49fa4ca03 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowRemovalOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.row;
 
 import java.io.IOException;
@@ -37,11 +38,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class RowRemovalOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "row-removal", RowRemovalOperation.class);
     }
-    
+
     @Test
     public void serializeRowRemovalOperation() throws IOException {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java
index 3e6943a8d..87cc866ea 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.row;
 
 import java.util.Properties;
@@ -47,67 +48,64 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class RowReorderOperationTests extends RefineTest {
-    
+
     Project project = null;
 
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "row-reorder", RowReorderOperation.class);
     }
-    
+
     @BeforeMethod
     public void setUp() {
         project = createCSVProject(
-                "key,first\n"+
-                "8,b\n"+
-                ",d\n"+
-                "2,f\n"+
-                "1,h\n");
+                "key,first\n" +
+                        "8,b\n" +
+                        ",d\n" +
+                        "2,f\n" +
+                        "1,h\n");
     }
-    
+
     @AfterMethod
     public void tearDown() {
         ProjectManager.singleton.deleteProject(project.id);
     }
-    
+
     @Test
     public void testSortEmptyString() throws Exception {
         String sortingJson = "{\"criteria\":[{\"column\":\"key\",\"valueType\":\"number\",\"reverse\":false,\"blankPosition\":2,\"errorPosition\":1}]}";
         SortingConfig sortingConfig = SortingConfig.reconstruct(sortingJson);
         project.rows.get(1).cells.set(0, new Cell("", null));
         AbstractOperation op = new RowReorderOperation(
-                Mode.RowBased, sortingConfig
-                );
+                Mode.RowBased, sortingConfig);
         Process process = op.createProcess(project, new Properties());
         process.performImmediate();
-        
+
         Assert.assertEquals("h", project.rows.get(0).cells.get(1).value);
         Assert.assertEquals("f", project.rows.get(1).cells.get(1).value);
         Assert.assertEquals("b", project.rows.get(2).cells.get(1).value);
         Assert.assertEquals("d", project.rows.get(3).cells.get(1).value);
     }
 
-   
     @Test
     public void serializeRowReorderOperation() throws Exception {
-        String json = "  {\n" + 
-                "    \"op\": \"core/row-reorder\",\n" + 
-                "    \"description\": \"Reorder rows\",\n" + 
-                "    \"mode\": \"record-based\",\n" + 
-                "    \"sorting\": {\n" + 
-                "      \"criteria\": [\n" + 
-                "        {\n" + 
-                "          \"errorPosition\": 1,\n" + 
-                "          \"valueType\": \"number\",\n" + 
-                "          \"column\": \"start_year\",\n" + 
-                "          \"blankPosition\": 2,\n" + 
-                "          \"reverse\": false\n" + 
-                "        }\n" + 
-                "      ]\n" + 
-                "    }\n" + 
+        String json = "  {\n" +
+                "    \"op\": \"core/row-reorder\",\n" +
+                "    \"description\": \"Reorder rows\",\n" +
+                "    \"mode\": \"record-based\",\n" +
+                "    \"sorting\": {\n" +
+                "      \"criteria\": [\n" +
+                "        {\n" +
+                "          \"errorPosition\": 1,\n" +
+                "          \"valueType\": \"number\",\n" +
+                "          \"column\": \"start_year\",\n" +
+                "          \"blankPosition\": 2,\n" +
+                "          \"reverse\": false\n" +
+                "        }\n" +
+                "      ]\n" +
+                "    }\n" +
                 "  }";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, RowReorderOperation.class), json);
     }
 
 }
-
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java
index 47a8999e6..1f0820388 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/operations/row/RowStarOperationTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.operations.row;
 
 import org.testng.annotations.BeforeSuite;
@@ -35,11 +36,12 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class RowStarOperationTests extends RefineTest {
+
     @BeforeSuite
     public void registerOperation() {
         OperationRegistry.registerOperation(getCoreModule(), "row-star", RowStarOperation.class);
     }
-    
+
     @Test
     public void serializeRowStarOperation() throws Exception {
         String json = "{"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.java b/OpenRefine/main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.java
index 03f41ec5a..a3e89e864 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/preference/PreferenceStoreTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.preference;
 
 import static org.testng.Assert.assertFalse;
@@ -39,6 +40,7 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class PreferenceStoreTests {
+
     public static String json = "{"
             + "\"entries\":{"
             + "   \"reconciliation.standardServices\":["
@@ -47,10 +49,10 @@ public class PreferenceStoreTests {
             + "   \"scripting.starred-expressions\":{\"class\":\"com.google.refine.preference.TopList\",\"top\":2147483647,\"list\":[]},"
             + "   \"scripting.expressions\":{\"class\":\"com.google.refine.preference.TopList\",\"top\":100,\"list\":[]}"
             + "}}";
-    
+
     @Test
     public void serializePreferenceStore() throws JsonParseException, JsonMappingException, IOException {
- 
+
         String jsonAfter = "{"
                 + "\"entries\":{"
                 + "   \"reconciliation.standardServices\":["
@@ -67,5 +69,5 @@ public class PreferenceStoreTests {
         TestUtils.isSerializedTo(prefStore, jsonAfter);
         assertFalse(prefStore.isDirty());
     }
-    
+
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/preference/TopListTests.java b/OpenRefine/main/tests/server/src/com/google/refine/preference/TopListTests.java
index ced3ba05c..7ed5cbf93 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/preference/TopListTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/preference/TopListTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.preference;
 
 import java.io.IOException;
@@ -37,6 +38,7 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class TopListTests {
+
     @Test
     public void serializeTopList() throws JsonParseException, JsonMappingException, IOException {
         String json = "{"
@@ -54,8 +56,8 @@ public class TopListTests {
         TestUtils.isSerializedTo(
                 prefValue,
                 json);
-        
-        String mapJson = "{\"key\":"+json+"}";
-        TestUtils.isSerializedTo(Collections.singletonMap("key",prefValue), mapJson);
+
+        String mapJson = "{\"key\":" + json + "}";
+        TestUtils.isSerializedTo(Collections.singletonMap("key", prefValue), mapJson);
     }
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/process/HistoryProcessTests.java b/OpenRefine/main/tests/server/src/com/google/refine/process/HistoryProcessTests.java
index 6def43732..c465898cd 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/process/HistoryProcessTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/process/HistoryProcessTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.process;
 
 import static org.mockito.Mockito.mock;
@@ -42,7 +43,7 @@ import com.google.refine.ProjectMetadata;
 import com.google.refine.RefineTest;
 
 public class HistoryProcessTests extends RefineTest {
-    
+
     private Project project;
     private ProjectMetadata projectMetadata;
 
@@ -58,7 +59,7 @@ public class HistoryProcessTests extends RefineTest {
         entry = new HistoryEntry(5678L, project, "second operation", op, ch);
         project.history.addEntry(entry);
     }
-    
+
     @Test
     public void serializeHistoryProcess() {
         HistoryProcess process = new HistoryProcess(project, 1234L);
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessStub.java b/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessStub.java
index 278026e6b..4a146a741 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessStub.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessStub.java
@@ -1,9 +1,9 @@
+
 package com.google.refine.process;
 
 /**
- * A long running process that we can actually run in the main
- * thread of the test runner, because during tests it is actually
- * expected to be quick.
+ * A long running process that we can actually run in the main thread of the test runner, because during tests it is
+ * actually expected to be quick.
  * 
  * It wraps an existing LongRunningProcess
  * 
@@ -11,21 +11,21 @@ package com.google.refine.process;
  *
  */
 public class LongRunningProcessStub extends LongRunningProcess {
-	
-	protected LongRunningProcess wrapped;
 
-	public LongRunningProcessStub(Process process) {
-		super("some description");
-		this.wrapped = (LongRunningProcess)process;
-	}
-	
-	public void run() {
-		wrapped.getRunnable().run();
-	}
+    protected LongRunningProcess wrapped;
 
-	@Override
-	protected Runnable getRunnable() {
-		return wrapped.getRunnable();
-	}
+    public LongRunningProcessStub(Process process) {
+        super("some description");
+        this.wrapped = (LongRunningProcess) process;
+    }
+
+    public void run() {
+        wrapped.getRunnable().run();
+    }
+
+    @Override
+    protected Runnable getRunnable() {
+        return wrapped.getRunnable();
+    }
 
 }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessTests.java b/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessTests.java
index ff8488715..dd33eaa81 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/process/LongRunningProcessTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.process;
 
 import org.testng.annotations.Test;
@@ -31,7 +32,7 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class LongRunningProcessTests {
-    
+
     public static class LongRunningProcessStub extends LongRunningProcess {
 
         protected LongRunningProcessStub(String description) {
@@ -42,14 +43,15 @@ public class LongRunningProcessTests {
         protected Runnable getRunnable() {
             return null;
         }
-        
+
     }
+
     @Test
     public void serializeLongRunningProcess() {
         LongRunningProcess process = new LongRunningProcessStub("some description");
         int hashCode = process.hashCode();
         TestUtils.isSerializedTo(process, "{"
-                + "\"id\":"+hashCode+","
+                + "\"id\":" + hashCode + ","
                 + "\"description\":\"some description\","
                 + "\"immediate\":false,"
                 + "\"status\":\"pending\","
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/process/ProcessManagerTests.java b/OpenRefine/main/tests/server/src/com/google/refine/process/ProcessManagerTests.java
index d07f6e981..40d7c714e 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/process/ProcessManagerTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/process/ProcessManagerTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.process;
 
 import org.testng.annotations.BeforeMethod;
@@ -33,17 +34,17 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class ProcessManagerTests {
-    
+
     ProcessManager processManager;
     Process process1, process2;
-    
+
     @BeforeMethod
     public void setUp() {
         processManager = new ProcessManager();
         process1 = new LongRunningProcessTests.LongRunningProcessStub("some description");
         process2 = new LongRunningProcessTests.LongRunningProcessStub("some other description");
     }
-    
+
     @Test
     public void serializeProcessManager() throws Exception {
         processManager.queueProcess(process1);
@@ -58,7 +59,7 @@ public class ProcessManagerTests {
         }
         String processJson = ParsingUtilities.defaultWriter.writeValueAsString(process2);
         TestUtils.isSerializedTo(processManager, "{"
-                + "\"processes\":["+processJson+"],\n"
+                + "\"processes\":[" + processJson + "],\n"
                 + "\"exceptions\":[{\"message\":\"unexpected error\"}]"
                 + "}");
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.java b/OpenRefine/main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.java
index 91aa76a03..0be4616ed 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/process/QuickHistoryEntryProcessTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.process;
 
 import static org.mockito.Mockito.mock;
@@ -35,11 +36,12 @@ import com.google.refine.model.Project;
 import com.google.refine.util.TestUtils;
 
 public class QuickHistoryEntryProcessTests {
+
     public static class QuickHistoryEntryProcessStub extends QuickHistoryEntryProcess {
 
         public QuickHistoryEntryProcessStub(Project project, String briefDescription) {
             super(project, briefDescription);
-            
+
         }
 
         @Override
@@ -47,16 +49,16 @@ public class QuickHistoryEntryProcessTests {
                 throws Exception {
             return null;
         }
-        
+
     }
-    
+
     @Test
     public void serializeQuickHistoryEntryProcess() {
         Project project = mock(Project.class);
         Process process = new QuickHistoryEntryProcessStub(project, "quick description");
         int hashCode = process.hashCode();
         TestUtils.isSerializedTo(process, "{"
-                + "\"id\":"+hashCode+","
+                + "\"id\":" + hashCode + ","
                 + "\"description\":"
                 + "\"quick description\","
                 + "\"immediate\":true,"
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java b/OpenRefine/main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java
index e3ef3017a..3dc05a242 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/sorting/BooleanCriterionTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.sorting;
 
 import java.io.IOException;
@@ -34,15 +35,15 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class BooleanCriterionTest {
+
     @Test
     public void serializeBooleanCriterion() throws IOException {
-        String json = 
-                "        {\n" + 
-                "          \"errorPosition\": 1,\n" + 
-                "          \"valueType\": \"boolean\",\n" + 
-                "          \"column\": \"start_year\",\n" + 
-                "          \"blankPosition\": 2,\n" + 
-                "          \"reverse\": false\n" + 
+        String json = "        {\n" +
+                "          \"errorPosition\": 1,\n" +
+                "          \"valueType\": \"boolean\",\n" +
+                "          \"column\": \"start_year\",\n" +
+                "          \"blankPosition\": 2,\n" +
+                "          \"reverse\": false\n" +
                 "        }\n";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, Criterion.class), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java b/OpenRefine/main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java
index 4eef6c0b3..a4d799d56 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/sorting/DateCriterionTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.sorting;
 
 import java.io.IOException;
@@ -34,15 +35,15 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class DateCriterionTest {
+
     @Test
     public void serializeDateCriterion() throws IOException {
-        String json = 
-                "        {\n" + 
-                "          \"errorPosition\": 2,\n" + 
-                "          \"valueType\": \"date\",\n" + 
-                "          \"column\": \"start_year\",\n" + 
-                "          \"blankPosition\": -1,\n" + 
-                "          \"reverse\": true\n" + 
+        String json = "        {\n" +
+                "          \"errorPosition\": 2,\n" +
+                "          \"valueType\": \"date\",\n" +
+                "          \"column\": \"start_year\",\n" +
+                "          \"blankPosition\": -1,\n" +
+                "          \"reverse\": true\n" +
                 "        }\n";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, Criterion.class), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java b/OpenRefine/main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java
index fdac23fc1..281adb848 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/sorting/NumberCriterionTest.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.sorting;
 
 import java.io.IOException;
@@ -34,15 +35,15 @@ import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.TestUtils;
 
 public class NumberCriterionTest {
+
     @Test
     public void serializeNumberCriterion() throws IOException {
-        String json = 
-                "        {\n" + 
-                "          \"errorPosition\": 2,\n" + 
-                "          \"valueType\": \"number\",\n" + 
-                "          \"column\": \"start_year\",\n" + 
-                "          \"blankPosition\": 1,\n" + 
-                "          \"reverse\": true\n" + 
+        String json = "        {\n" +
+                "          \"errorPosition\": 2,\n" +
+                "          \"valueType\": \"number\",\n" +
+                "          \"column\": \"start_year\",\n" +
+                "          \"blankPosition\": 1,\n" +
+                "          \"reverse\": true\n" +
                 "        }\n";
         TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, Criterion.class), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/sorting/SortingConfigTests.java b/OpenRefine/main/tests/server/src/com/google/refine/sorting/SortingConfigTests.java
index d5eb6c250..aad505037 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/sorting/SortingConfigTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/sorting/SortingConfigTests.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.sorting;
 
 import java.io.IOException;
@@ -33,18 +34,19 @@ import org.testng.annotations.Test;
 import com.google.refine.util.TestUtils;
 
 public class SortingConfigTests {
+
     @Test
     public void serializeSortingConfig() throws IOException {
-        String json = "{\n" + 
-                "      \"criteria\": [\n" + 
-                "        {\n" + 
-                "          \"errorPosition\": 1,\n" + 
-                "          \"valueType\": \"number\",\n" + 
-                "          \"column\": \"start_year\",\n" + 
-                "          \"blankPosition\": 2,\n" + 
-                "          \"reverse\": false\n" + 
-                "        }\n" + 
-                "      ]\n" + 
+        String json = "{\n" +
+                "      \"criteria\": [\n" +
+                "        {\n" +
+                "          \"errorPosition\": 1,\n" +
+                "          \"valueType\": \"number\",\n" +
+                "          \"column\": \"start_year\",\n" +
+                "          \"blankPosition\": 2,\n" +
+                "          \"reverse\": false\n" +
+                "        }\n" +
+                "      ]\n" +
                 "    }";
         TestUtils.isSerializedTo(SortingConfig.reconstruct(json), json);
     }
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java b/OpenRefine/main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java
index 125765972..ed3eb6a70 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/util/ParsingUtilitiesTests.java
@@ -51,31 +51,30 @@ import org.testng.annotations.Test;
 
 import com.google.refine.RefineTest;
 
-
 public class ParsingUtilitiesTests extends RefineTest {
-    
+
     @Override
     @BeforeTest
     public void init() {
         logger = LoggerFactory.getLogger(this.getClass());
     }
-    
+
     @Test
     public void zonedDateTimeTest() {
-        String  d = "2017-12-01T14:53:36Z";
+        String d = "2017-12-01T14:53:36Z";
         DateTimeFormatter formatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
         OffsetDateTime.parse(d, formatter);
     }
-    
+
     @Test
     public void parseProjectBeforeJDK8() {
         String historyEntryDate = "2017-12-01T14:53:36Z";
-        
+
         OffsetDateTime zdt = ParsingUtilities.stringToDate(historyEntryDate);
         String zdtString = ParsingUtilities.dateToString(zdt);
         Assert.assertEquals(zdtString, historyEntryDate);
     }
-    
+
     @Test
     public void stringToDate() {
         Assert.assertEquals(2017, ParsingUtilities.stringToDate("2017-04-03T08:09:43.123").getYear());
@@ -84,7 +83,7 @@ public class ParsingUtilitiesTests extends RefineTest {
         Assert.assertEquals(2017, ParsingUtilities.stringToDate("2017-04-03T08:09:43.123Z").getYear());
         Assert.assertEquals(2017, ParsingUtilities.stringToDate("2017-04-03T08:09:43+00:00").getYear());
     }
-    
+
     @Test
     public void stringToLocalDate() {
         Assert.assertEquals(2017, ParsingUtilities.stringToLocalDate("2017-04-03T08:09:43.123").getYear());
@@ -130,12 +129,12 @@ public class ParsingUtilitiesTests extends RefineTest {
                     "</BODY>\n" +
                     "\n" +
                     "</HTML>";
-            ByteArrayOutputStream obj=new ByteArrayOutputStream();
+            ByteArrayOutputStream obj = new ByteArrayOutputStream();
             GZIPOutputStream gzip = new GZIPOutputStream(obj);
             gzip.write(sampleBody.getBytes("UTF-8"));
             gzip.close();
             byte[] compressed = obj.toByteArray();
-            
+
             String res = ParsingUtilities.inputStreamToString(new ByteArrayInputStream(compressed), "gzip");
             Assert.assertEquals(res, sampleBody);
         } catch (Exception e) {
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java b/OpenRefine/main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java
index ee409b772..d5b5294e6 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/util/PatternSyntaxExceptionParserTests.java
@@ -44,7 +44,7 @@ import org.testng.annotations.Test;
 import com.google.refine.RefineTest;
 
 public class PatternSyntaxExceptionParserTests extends RefineTest {
-    
+
     @Override
     @BeforeTest
     public void init() {
@@ -52,116 +52,116 @@ public class PatternSyntaxExceptionParserTests extends RefineTest {
     }
 
     @Test
-    public void unmatchedOpeningParenthesisTest(){
+    public void unmatchedOpeningParenthesisTest() {
         String s = "(abc";
         try {
             Pattern.compile(s);
-            Assert.assertTrue(false,"Test pattern successfully compiled when it should fail");
+            Assert.assertTrue(false, "Test pattern successfully compiled when it should fail");
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression is missing a closing ')' character.");
+                    "The regular expression is missing a closing ')' character.");
         }
     }
 
     @Test
-    public void unmatchedClosingParenthesisTest(){
+    public void unmatchedClosingParenthesisTest() {
         String s = "abc)";
         try {
             Pattern.compile(s);
-            Assert.assertTrue(false,"Test pattern successfully compiled when it should fail");
+            Assert.assertTrue(false, "Test pattern successfully compiled when it should fail");
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression is missing a opening '(' character.");
+                    "The regular expression is missing a opening '(' character.");
         }
     }
 
     @Test
-    public void unmatchedOpeningSquareBracketTest(){
+    public void unmatchedOpeningSquareBracketTest() {
         String s = "[abc";
         try {
             Pattern.compile(s);
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression is missing a closing ']' character, or has an empty pair of square brackets '[]'.");
+                    "The regular expression is missing a closing ']' character, or has an empty pair of square brackets '[]'.");
         }
     }
 
     @Test
-    public void danglingBackslashTest(){
+    public void danglingBackslashTest() {
         String s = "abc\\";
         try {
             Pattern.compile(s);
-            Assert.assertTrue(false,"Test pattern successfully compiled when it should fail");
+            Assert.assertTrue(false, "Test pattern successfully compiled when it should fail");
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression has a backslash '\\' at the end.");
+                    "The regular expression has a backslash '\\' at the end.");
         }
     }
 
     @Test
-    public void unmatchedOpeningCurlyBracketTest(){
+    public void unmatchedOpeningCurlyBracketTest() {
         String s = "abc{3";
         try {
             Pattern.compile(s);
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression is missing a closing '}' character, or has an incorrect quantifier statement in curly brackets '{}'.");
+                    "The regular expression is missing a closing '}' character, or has an incorrect quantifier statement in curly brackets '{}'.");
         }
     }
 
     @Test
-    public void illegalQuantifierStatement(){
+    public void illegalQuantifierStatement() {
         String s = "abc{";
         try {
             Pattern.compile(s);
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression has an incomplete or incorrect quantifier statement in curly brackets '{}'.");
+                    "The regular expression has an incomplete or incorrect quantifier statement in curly brackets '{}'.");
         }
     }
 
     @Test
-    public void quantifierTargetValidityTest(){
+    public void quantifierTargetValidityTest() {
         String s = "abc+*";
         try {
             Pattern.compile(s);
-            Assert.assertTrue(false,"Test pattern successfully compiled when it should fail");
+            Assert.assertTrue(false, "Test pattern successfully compiled when it should fail");
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression has a '*','+' or '?' in the wrong place.");
+                    "The regular expression has a '*','+' or '?' in the wrong place.");
         }
     }
 
     @Test
-    public void quantifierMagnitudeTest(){
+    public void quantifierMagnitudeTest() {
         String s = "a{4,3}";
         try {
             Pattern.compile(s);
-            Assert.assertTrue(false,"Test pattern successfully compiled when it should fail");
+            Assert.assertTrue(false, "Test pattern successfully compiled when it should fail");
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression has a quantifier statement where the minimum is larger than the maximum (e.g. {4,3}).");
+                    "The regular expression has a quantifier statement where the minimum is larger than the maximum (e.g. {4,3}).");
         }
     }
 
     @Test
-    public void rangeOrderTest(){
+    public void rangeOrderTest() {
         String s = "abc[9-0]";
         try {
             Pattern.compile(s);
-            Assert.assertTrue(false,"Test pattern successfully compiled when it should fail");
+            Assert.assertTrue(false, "Test pattern successfully compiled when it should fail");
         } catch (PatternSyntaxException err) {
             PatternSyntaxExceptionParser e = new PatternSyntaxExceptionParser(err);
             Assert.assertEquals(e.getUserMessage(),
-                                "The regular expression has a range statement which is incomplete or has the characters in the incorrect order (e.g. [9-0])");
+                    "The regular expression has a range statement which is incomplete or has the characters in the incorrect order (e.g. [9-0])");
         }
     }
 
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/util/StringUtilsTests.java b/OpenRefine/main/tests/server/src/com/google/refine/util/StringUtilsTests.java
index 067bf0900..12a8682dd 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/util/StringUtilsTests.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/util/StringUtilsTests.java
@@ -1,3 +1,4 @@
+
 package com.google.refine.util;
 
 import com.google.refine.RefineTest;
@@ -11,8 +12,8 @@ public class StringUtilsTests extends RefineTest {
     public void objectToString() {
         Object nullObject = null;
         Object[] emptyArray = {};
-        Object[] objArray = {4, "hello", true, 0.01};
-        Object[][] multiArray = {{"OpenRefine", 12}, {13, 4.6}, {"data", "mining"}};
+        Object[] objArray = { 4, "hello", true, 0.01 };
+        Object[][] multiArray = { { "OpenRefine", 12 }, { 13, 4.6 }, { "data", "mining" } };
         OffsetDateTime time = OffsetDateTime.parse("2017-01-02T01:02:03Z");
 
         Assert.assertEquals("", StringUtils.toString(nullObject));
diff --git a/OpenRefine/main/tests/server/src/com/google/refine/util/TestUtils.java b/OpenRefine/main/tests/server/src/com/google/refine/util/TestUtils.java
index d3a80a9b7..2559ee6bb 100644
--- a/OpenRefine/main/tests/server/src/com/google/refine/util/TestUtils.java
+++ b/OpenRefine/main/tests/server/src/com/google/refine/util/TestUtils.java
@@ -24,6 +24,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
+
 package com.google.refine.util;
 
 import static org.testng.Assert.fail;
@@ -45,9 +46,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
-
 public class TestUtils {
-    
+
     static ObjectMapper mapper = new ObjectMapper();
     static {
         mapper = mapper.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
@@ -58,8 +58,8 @@ public class TestUtils {
     }
 
     /**
-     * Create a temporary directory. NOTE: This is a quick and dirty
-     * implementation suitable for tests, not production code.
+     * Create a temporary directory. NOTE: This is a quick and dirty implementation suitable for tests, not production
+     * code.
      * 
      * @param name
      * @return
@@ -76,8 +76,7 @@ public class TestUtils {
     /**
      * Assert that two JSON strings are equal as JSON objects.
      *
-     * @deprecated for 3.5 by Tom Morris Use the method with the same parameter
-     *             order as the rest of the assert
+     * @deprecated for 3.5 by Tom Morris Use the method with the same parameter order as the rest of the assert
      *             methods{@link #assertEqualsAsJson(String, String)}
      */
     public static void assertEqualAsJson(String expected, String actual) {
@@ -95,31 +94,32 @@ public class TestUtils {
                 jsonDiff(expected, actual);
                 fail("Objects above are not equal as JSON strings.");
             }
-        } catch(Exception e) {
-            fail("\""+actual+"\" and \""+expected+"\" are not equal as JSON strings.");
+        } catch (Exception e) {
+            fail("\"" + actual + "\" and \"" + expected + "\" are not equal as JSON strings.");
         }
     }
-    
-    public static boolean equalAsJson(String a, String b)  {
+
+    public static boolean equalAsJson(String a, String b) {
         try {
             JsonNode jsonA = mapper.readValue(a, JsonNode.class);
             JsonNode jsonB = mapper.readValue(b, JsonNode.class);
             return (jsonA == null && jsonB == null) || jsonA.equals(jsonB);
-        } catch(Exception e) {
+        } catch (Exception e) {
             return false;
         }
     }
 
     /**
      * Checks that a serializable object is serialized to the target JSON string.
-     * @throws IOException 
+     * 
+     * @throws IOException
      */
     public static void isSerializedTo(Object o, String targetJson, boolean saveMode) {
 
         // also check Jackson serialization
         try {
             ObjectWriter writer = null;
-            if(saveMode) {
+            if (saveMode) {
                 writer = ParsingUtilities.saveWriter;
             } else {
                 writer = ParsingUtilities.defaultWriter;
@@ -131,14 +131,14 @@ public class TestUtils {
             fail("jackson serialization failed");
         }
     }
-    
+
     /**
      * Checks that a serializable object is serialized to the target JSON string.
      */
     public static void isSerializedTo(Object o, String targetJson) {
         isSerializedTo(o, targetJson, false);
     }
-    
+
     public static void jsonDiff(String a, String b) throws JsonParseException, JsonMappingException {
         ObjectMapper myMapper = mapper.copy().configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true)
                 .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true)
@@ -148,39 +148,39 @@ public class TestUtils {
             JsonNode nodeB = myMapper.readValue(b, JsonNode.class);
             String prettyA = myMapper.writeValueAsString(myMapper.treeToValue(nodeA, Object.class));
             String prettyB = myMapper.writeValueAsString(myMapper.treeToValue(nodeB, Object.class));
-            
+
             // Compute the max line length of A
             LineNumberReader readerA = new LineNumberReader(new StringReader(prettyA));
             int maxLength = 0;
             String line = readerA.readLine();
             while (line != null) {
-                if(line.length() > maxLength) {
+                if (line.length() > maxLength) {
                     maxLength = line.length();
                 }
                 line = readerA.readLine();
             }
-            
+
             // Pad all lines
             readerA = new LineNumberReader(new StringReader(prettyA));
             LineNumberReader readerB = new LineNumberReader(new StringReader(prettyB));
             StringWriter writer = new StringWriter();
             String lineA = readerA.readLine();
             String lineB = readerB.readLine();
-            while(lineA != null || lineB != null) {
+            while (lineA != null || lineB != null) {
                 if (lineA == null) {
                     lineA = "";
                 }
                 if (lineB == null) {
                     lineB = "";
                 }
-                String paddedLineA = lineA +  new String(new char[maxLength + 2 - lineA.length()]).replace("\0", " ");
+                String paddedLineA = lineA + new String(new char[maxLength + 2 - lineA.length()]).replace("\0", " ");
                 writer.write(paddedLineA);
                 writer.write(lineB + "\n");
                 lineA = readerA.readLine();
                 lineB = readerB.readLine();
             }
             System.out.print(writer.toString());
-        } catch(IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }
diff --git a/OpenRefine/licenses/chrome_frame.LICENSE.txt b/OpenRefine/main/webapp/licenses/chrome_frame.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/chrome_frame.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/chrome_frame.LICENSE.txt
diff --git a/OpenRefine/licenses/datejs.LICENSE.txt b/OpenRefine/main/webapp/licenses/datejs.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/datejs.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/datejs.LICENSE.txt
diff --git a/OpenRefine/licenses/freebase_suggest.LICENSE.txt b/OpenRefine/main/webapp/licenses/freebase_suggest.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/freebase_suggest.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/freebase_suggest.LICENSE.txt
diff --git a/OpenRefine/licenses/imgareaselect.LICENSE.txt b/OpenRefine/main/webapp/licenses/imgareaselect.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/imgareaselect.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/imgareaselect.LICENSE.txt
diff --git a/OpenRefine/licenses/jquery.LICENSE.txt b/OpenRefine/main/webapp/licenses/jquery.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/jquery.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/jquery.LICENSE.txt
diff --git a/OpenRefine/licenses/jquery.eventstack.LICENSE.txt b/OpenRefine/main/webapp/licenses/jquery.eventstack.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/jquery.eventstack.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/jquery.eventstack.LICENSE.txt
diff --git a/OpenRefine/licenses/jquery.i18n.LICENSE.txt b/OpenRefine/main/webapp/licenses/jquery.i18n.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/jquery.i18n.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/jquery.i18n.LICENSE.txt
diff --git a/OpenRefine/licenses/jquery_ui.LICENSE.txt b/OpenRefine/main/webapp/licenses/jquery_ui.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/jquery_ui.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/jquery_ui.LICENSE.txt
diff --git a/OpenRefine/licenses/simile-ajax.2.3.0.LICENSE.txt b/OpenRefine/main/webapp/licenses/simile-ajax.2.3.0.LICENSE.txt
similarity index 100%
rename from OpenRefine/licenses/simile-ajax.2.3.0.LICENSE.txt
rename to OpenRefine/main/webapp/licenses/simile-ajax.2.3.0.LICENSE.txt
diff --git a/OpenRefine/main/webapp/modules/core/langs/translation-en.json b/OpenRefine/main/webapp/modules/core/langs/translation-en.json
index fdf88f4a7..fdf1ecea9 100644
--- a/OpenRefine/main/webapp/modules/core/langs/translation-en.json
+++ b/OpenRefine/main/webapp/modules/core/langs/translation-en.json
@@ -449,6 +449,8 @@
     "core-views/collapse-other": "Collapse all other columns",
     "core-views/collapse-left": "Collapse all columns to left",
     "core-views/collapse-right": "Collapse all columns to right",
+    "core-views/expand-left": "Expand all columns to the left",
+    "core-views/expand-right": "Expand all columns to the right",
     "core-views/reconcile": "Reconcile",
     "core-views/reconcile-tooltip": "Match this column's cells to items from external databases",
     "core-views/reverse": "Reverse",
diff --git a/OpenRefine/main/webapp/modules/core/langs/translation-fr.json b/OpenRefine/main/webapp/modules/core/langs/translation-fr.json
index 622cbeb2c..b32c80505 100644
--- a/OpenRefine/main/webapp/modules/core/langs/translation-fr.json
+++ b/OpenRefine/main/webapp/modules/core/langs/translation-fr.json
@@ -414,7 +414,7 @@
     "core-views/filtered-cell": "Apparier toutes les cellules filtrées avec…",
     "core-views/bounded-log-facet": "Facette logarithmique de limite 1",
     "core-views/remove-col": "Supprimer cette colonne",
-    "core-views/new-topic2": "Marquer pour créer un nouveau Élément pour chaque cellule de cette colonne pour toutes les lignes actuellement filtrées",
+    "core-views/new-topic2": "Marquer pour créer un nouvel élément pour chaque cellule de cette colonne pour toutes les lignes actuellement filtrées",
     "core-views/collapse-left": "Masquer toutes les colonnes à gauche",
     "core-views/custom-text-trans": "Transformation textuelle personnalisée sur la colonne",
     "core-views/configure-prop": "configurer",
@@ -423,10 +423,10 @@
     "core-views/smallest-first": "croissant",
     "core-views/warning-col-name": "Vous devez indiquer un nom de colonne.",
     "core-views/match-this": "Apparier seulement cette cellule",
-    "core-views/one-topic": "Créer un nouveau Élément pour les cellules similaires",
+    "core-views/one-topic": "Créer un nouvel élément pour les cellules similaires",
     "core-views/sort-cell": "Trier les valeurs des cellules comme",
     "core-views/add-col-recon-col": "Ajouter des colonnes à partir de la colonne",
-    "core-views/create-topic-cells": "Créer un nouvel Élément pour cette cellule et toutes celles identiques",
+    "core-views/create-topic-cells": "Créer un nouvel élément pour cette cellule et toutes celles identiques",
     "core-views/add-based-col": "Ajouter une colonne en fonction de cette colonne",
     "core-views/rename-col": "Renommer cette colonne",
     "core-views/facet-empty-string": "Facette par chaîne vide",
@@ -440,7 +440,7 @@
     "core-views/booleans": "booléens",
     "core-views/specify-sep": "Merci d’indiquer un séparateur.",
     "core-views/valid-values": "Valeurs valides",
-    "core-views/create-topic": "Créer un nouvel Élément",
+    "core-views/create-topic": "Créer un nouvel élément",
     "core-views/star-rows": "Étoiler les lignes",
     "core-views/blank-down": "Vider les valeurs répétées dans des cellules consécutives",
     "core-views/spec-new-name": "Merci d’indiquer le nom de la nouvelle colonne des clés.",
@@ -453,7 +453,7 @@
     "core-views/facets": "Facettes",
     "core-views/choose-match": "Choisir une nouvelle correspondance",
     "core-views/largest-first": "décroissant",
-    "core-views/create-topic-cell": "Créer un nouvel Élément pour cette cellule",
+    "core-views/create-topic-cell": "Créer un nouvel élément pour cette cellule",
     "core-views/move-to-left": "Déplacer la colonne à gauche",
     "core-views/keep-or": "conserver l’original",
     "core-views/log-length-facet": "Facette logarithmique de longueur du texte",
@@ -558,14 +558,14 @@
     "core-views/transform": "Transformer",
     "core-views/by": "Par",
     "core-views/configure-col": "Configurer cette colonne",
-    "core-views/one-topic2": "Marquer pour créer un nouveau Élément pour chaque groupe de cellules similaires dans cette colonne pour toutes les lignes actuellement filtrées",
+    "core-views/one-topic2": "Marquer pour créer un nouvel élément pour chaque groupe de cellules similaires dans cette colonne pour toutes les lignes actuellement filtrées",
     "core-views/to-number": "En nombre",
     "core-views/forward": "en avant",
     "core-views/spec-new-val": "Merci d’indiquer le nom de la nouvelle colonne des valeurs.",
     "core-views/edit-cells": "Éditer les cellules",
     "core-views/contain-names": "(contenant les noms des colonnes d’origine)",
     "core-views/sort": "Trier",
-    "core-views/match-all-cells": "Apparier cet Élément et cette cellule et toutes celles identiques",
+    "core-views/match-all-cells": "Apparier cet élément et cette cellule et toutes celles identiques",
     "core-views/col-at-most": "colonnes au plus (laisser vide pour ne pas limiter)",
     "core-views/warning-sel-judg": "Merci de choisir au moins une sorte d’avis à copier.",
     "core-views/remove-sort": "Supprimer le tri",
@@ -582,7 +582,7 @@
     "core-views/reconcile-tooltip": "Apparier les cellules de cette colonne aux entrées de bases de données externes",
     "core-views/guess-cell": "Deviner le type de cellule",
     "core-views/enter-separator": "Indiquer le séparateur à utiliser entre les valeurs",
-    "core-views/new-topic": "Créer un nouveau Élément pour chaque cellule",
+    "core-views/new-topic": "Créer un nouvel élément pour chaque cellule",
     "core-views/add-by-urls": "Ajouter une colonne en moissonnant des URL",
     "core-views/show": "Afficher",
     "core-views/add-col-col": "Ajouter une colonne en fonction d’une colonne",
@@ -607,7 +607,7 @@
     "core-views/facet-error": "Facette par erreur",
     "core-views/display-null": "Afficher/masquer les valeurs nulles dans les cellules",
     "core-views/on-error": "En cas d’erreur",
-    "core-views/match-this-cell": "Apparier cet Élément et cette cellule",
+    "core-views/match-this-cell": "Apparier cet élément et cette cellule",
     "core-views/not-valid-date": "Date invalide.",
     "core-views/text-filter": "Filtrer le texte",
     "core-views/warning-no-property": "Veuillez d'abord sélectionner une propriété.",
diff --git a/OpenRefine/main/webapp/modules/core/langs/translation-hu.json b/OpenRefine/main/webapp/modules/core/langs/translation-hu.json
index 660d48a11..57909ffb6 100644
--- a/OpenRefine/main/webapp/modules/core/langs/translation-hu.json
+++ b/OpenRefine/main/webapp/modules/core/langs/translation-hu.json
@@ -1,5 +1,5 @@
 {
-    "name": "Magyar",
+    "name": "magyar",
     "core-index/help": "Súgó",
     "core-index/contributors": "Közreműködők:",
     "core-index/new-proj-name": "Új projekt neve:",
diff --git a/OpenRefine/main/webapp/modules/core/langs/translation-jp.json b/OpenRefine/main/webapp/modules/core/langs/translation-jp.json
index 5e8903f13..9159d05b6 100644
--- a/OpenRefine/main/webapp/modules/core/langs/translation-jp.json
+++ b/OpenRefine/main/webapp/modules/core/langs/translation-jp.json
@@ -34,12 +34,12 @@
     "core-index/value": "値",
     "core-index/delete": "削除",
     "core-index-create/almost-done": "ほぼ完了 …",
-    "core-index-create/min-remaining": "分程度かかります",
+    "core-index-create/min-remaining": "$1 分程度かかります",
     "core-index-create/create-proj": "プロジェクトを作成する",
     "core-index-create/from": "データを取得する",
     "core-index-create/memory-usage": "メモリ使用量:",
     "core-index-create/question": "インポートしたデータからプロジェクトをつくります。",
-    "core-index-create/sec-remaining": "秒程度かかります",
+    "core-index-create/sec-remaining": "$1 秒程度かかります",
     "core-index-create/done": "完了.",
     "core-index-create/formats": "TSV、CSV、*SV、Excel(xls/xlsx)、JSON、XML、RDF as XML、OpenDocument(ods)とGoogle Dataがサポートされています。他のフォーマットも、拡張機能（エクステンション）として追加できます。",
     "core-index-create/starting": "開始",
@@ -619,7 +619,7 @@
     "core-views/what-separator": "どんな区切り文字で値を分けますか？",
     "core-views/new-col-name": "新しいカラム名",
     "core-views/split-cells": "多値のセルを分割",
-    "core-views/titlecase": "頭だけ大文字に",
+    "core-views/titlecase": "語頭だけ大文字に",
     "core-views/fill-down": "下方向の空白を埋める",
     "core-views/spec-col-name": "新しいカラム名を指定してください。",
     "core-views/search-for": "検索内容",
@@ -801,5 +801,8 @@
     "core-views/edit-all-columns": "全カラム編集",
     "core-views/warn-of-pending-sort": "実行待ちソートがあります。表示データは結果を反映していません。",
     "core-dialogs/missing-bad-template": "テンプレートが不正・不存在",
-    "core-views/warning": "注意"
+    "core-views/warning": "注意",
+    "core-views/expand-left": "カラムを左側に展開",
+    "core-views/expand-right": "カラムを右側に展開",
+    "core-index-parser/disable-auto-preview": "自動プレビューしない"
 }
diff --git a/OpenRefine/main/webapp/modules/core/langs/translation-nl.json b/OpenRefine/main/webapp/modules/core/langs/translation-nl.json
index 9aece79b9..fbb3a412f 100644
--- a/OpenRefine/main/webapp/modules/core/langs/translation-nl.json
+++ b/OpenRefine/main/webapp/modules/core/langs/translation-nl.json
@@ -454,5 +454,8 @@
     "core-dialogs/ignore-facets": "Negeer facetten en filters en exporteer alle rijen",
     "core-dialogs/date-iso": "ISO 8601. Bijvoorbeeld: 2011-08-24T18:36:10+08:00",
     "core-dialogs/help/grelreference": "Voor meer informatie, zie de uitleg over GREL in het OpenRefine-handboek",
-    "core-dialogs/cell-value": "De waarde van de huidige cel. Dit is een shortcut voor 'cell.value'."
+    "core-dialogs/cell-value": "De waarde van de huidige cel. Dit is een shortcut voor 'cell.value'.",
+    "core-dialogs/rotated-counter-clock": "45° tegen de klok gedraaid",
+    "core-dialogs/choice-var-length": "Variatie in lengte van keuzes",
+    "core-index-parser/disable-auto-preview": "Automatische voorbeeldweergave uitschakelen"
 }
diff --git a/OpenRefine/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.html b/OpenRefine/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.html
old mode 100644
new mode 100755
diff --git a/OpenRefine/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js b/OpenRefine/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js
old mode 100644
new mode 100755
diff --git a/OpenRefine/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js b/OpenRefine/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js
index 4a58d3088..7aedc86e1 100644
--- a/OpenRefine/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js
+++ b/OpenRefine/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js
@@ -180,6 +180,45 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
             }
             self._dataTableView.render();
           }
+        },
+        {
+          label: $.i18n('core-views/expand-all'),
+          /**
+           * This function expands all the columns in the project
+           */
+          // CS427 Issue Link: https://github.com/OpenRefine/OpenRefine/issues/4067
+          click: function() {
+            self._dataTableView._collapsedColumnNames = [];
+            self._dataTableView.render();
+          }
+        },
+        {
+          label: $.i18n('core-views/expand-left'),
+          /**
+           * This function expands the columns to the left of the selected column
+           */
+          // CS427 Issue Link: https://github.com/OpenRefine/OpenRefine/issues/4067
+          click: function() {
+            //by deleting these entries from collapsedColumnNames, they won't render on the dataTableView
+            for (var i = 0; i < self._columnIndex; i++) {
+              delete self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name];
+            }
+            self._dataTableView.render();
+          }
+        },
+        {
+          label: $.i18n('core-views/expand-right'),
+          /**
+           * This function expands the columns to the right of the selected column
+           */
+          // CS427 Issue Link: https://github.com/OpenRefine/OpenRefine/issues/4067
+          click: function() {
+            //by deleting these entries from collapsedColumnNames, they won't render on the dataTableView
+            for (var i = self._columnIndex + 1; i < theProject.columnModel.columns.length; i++) {
+              delete self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name];
+            }
+            self._dataTableView.render();
+          }
         }
       ]
     },
diff --git a/OpenRefine/main/webapp/modules/core/scripts/views/data-table/data-table-view.js b/OpenRefine/main/webapp/modules/core/scripts/views/data-table/data-table-view.js
index 515d997ee..d874847eb 100644
--- a/OpenRefine/main/webapp/modules/core/scripts/views/data-table/data-table-view.js
+++ b/OpenRefine/main/webapp/modules/core/scripts/views/data-table/data-table-view.js
@@ -157,7 +157,7 @@ DataTableView.prototype._renderSortingControls = function(sortingControls) {
   $('<a href="javascript:{}"></a>')
   .addClass("action")
   .text($.i18n('core-views/sort') + " ")
-  .append($('<img>').attr("src", "../images/down-arrow.png"))
+  .append($('<img>').attr("src", "images/down-arrow.png"))
   .appendTo(sortingControls)
   .click(function() {
     self._createSortingMenu(this);
@@ -290,7 +290,7 @@ DataTableView.prototype._renderDataTables = function(table, tableHeader) {
             // See https://github.com/OpenRefine/OpenRefine/blob/master/main/src/com/google/refine/model/ColumnGroup.java
             // and https://github.com/OpenRefine/OpenRefine/tree/master/main/src/com/google/refine/importers/tree
             if (c == keys[k]) {
-              $('<img />').attr("src", "../images/down-arrow.png").appendTo(th);
+              $('<img />').attr("src", "images/down-arrow.png").appendTo(th);
               break;
             }
           }
diff --git a/OpenRefine/main/webapp/modules/core/styles/project.less b/OpenRefine/main/webapp/modules/core/styles/project.less
index 17bc92a3e..44c9fba30 100644
--- a/OpenRefine/main/webapp/modules/core/styles/project.less
+++ b/OpenRefine/main/webapp/modules/core/styles/project.less
@@ -76,9 +76,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   position: fixed;
   overflow: hidden;
   padding: 0px;
-  padding-top: @padding_tight;
+  padding-top: 0px;
   font-size: 1.3em;
   background: @chrome_secondary;  
+  border-top-right-radius: 7px;
   }
   
 #left-panel  .ui-tabs .ui-tabs-panel {
@@ -94,6 +95,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   padding: 0px;
   padding-left: @padding_tight;
   background: @chrome_primary;
+  border-top-left-radius: 7px;
   }
 
 #tool-panel {
diff --git a/OpenRefine/packaging/linux.xml b/OpenRefine/packaging/linux.xml
index 3409c4dbc..375b4808c 100644
--- a/OpenRefine/packaging/linux.xml
+++ b/OpenRefine/packaging/linux.xml
@@ -25,16 +25,17 @@
 	<exclude>**/pom.xml</exclude>
 	<exclude>**/.settings/**</exclude>
 	<exclude>**/.project</exclude>
+	<exclude>licenses/**</exclude> <!-- added below, separately -->
       </excludes>
     </fileSet>
-    <fileSet>
-      <directory>${rootdir}/licenses</directory>
+    <fileSet> <!-- licenses for the frontend -->
+      <directory>${rootdir}/main/webapp/licenses</directory>
       <outputDirectory>licenses</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>${rootdir}/licenses</directory>
-      <outputDirectory>licenses</outputDirectory>
-    </fileSet>    
+    <fileSet> <!-- this copies the licenses for the backend -->
+      <directory>${project.build.directory}/generated-resources</directory>
+      <outputDirectory>.</outputDirectory>
+    </fileSet>
     <fileSet>
       <directory>${rootdir}/extensions</directory>
       <outputDirectory>webapp/extensions</outputDirectory>
diff --git a/OpenRefine/packaging/pom.xml b/OpenRefine/packaging/pom.xml
index 2f7a20a2a..974eb8071 100644
--- a/OpenRefine/packaging/pom.xml
+++ b/OpenRefine/packaging/pom.xml
@@ -104,7 +104,20 @@
 
   <build>
     <plugins>
-      <plugin> <!-- necessary for launch4j -->
+      <plugin> <!-- gathers license files for all dependencies at packaging time -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>${license-plugin.version}</version>
+        <executions>
+          <execution>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>download-licenses</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin> <!-- necessary for Appbundle -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>3.0.0</version>
@@ -138,7 +151,18 @@
                         </fileset>
                     </copy>
                     
-                    <!-- <copy file="../server/target/openrefine-${project.version}-server.jar" tofile="${built.webapp.dir}/WEB-INF/lib/openrefine-${project.version}.jar"/> -->
+                    <copy todir="${built.webapp.dir}/licenses/"> <!-- licenses for the backend -->
+                        <fileset dir="${project.build.directory}/generated-resources/">
+                            <include name="licenses.xml" />
+                            <include name="licenses/**/*" />
+                        </fileset>
+                    </copy>
+
+                    <copy todir="${built.webapp.dir}/licenses/licenses/"> <!-- licenses for the frontend -->
+                        <fileset dir="${webapp.dir}/licenses/">
+                            <include name="**/*" />
+                        </fileset>
+                    </copy>
 
                     <copy todir="${built.webapp.dir}/extensions">
                         <fileset dir="../extensions">
@@ -308,7 +332,7 @@
                    https://stackoverflow.com/questions/53696439/appbundle-maven-plugin-fails-on-mac-osx-with-java-10 -->
               <groupId>org.codehaus.plexus</groupId>
               <artifactId>plexus-archiver</artifactId>
-              <version>4.2.6</version>
+              <version>4.2.7</version>
             </dependency>
             <dependency>
               <groupId>org.apache.velocity</groupId>
diff --git a/OpenRefine/packaging/windows.xml b/OpenRefine/packaging/windows.xml
index 1c22a85fd..5d5905a4d 100644
--- a/OpenRefine/packaging/windows.xml
+++ b/OpenRefine/packaging/windows.xml
@@ -38,16 +38,17 @@
 	<exclude>**/pom.xml</exclude>
 	<exclude>**/.settings/**</exclude>
 	<exclude>**/.project</exclude>
+	<exclude>licenses/**</exclude> <!-- added separately below -->
       </excludes>
     </fileSet>
-    <fileSet>
-      <directory>${rootdir}/licenses</directory>
+    <fileSet> <!-- licenses for the frontend -->
+      <directory>${rootdir}/main/webapp/licenses</directory>
       <outputDirectory>licenses</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>${rootdir}/licenses</directory>
-      <outputDirectory>licenses</outputDirectory>
-    </fileSet>    
+    <fileSet> <!-- licenses for the backend -->
+      <directory>${project.build.directory}/generated-resources</directory>
+      <outputDirectory>.</outputDirectory>
+    </fileSet>
     <fileSet>
       <directory>${rootdir}/extensions</directory>
       <outputDirectory>webapp/extensions</outputDirectory>
diff --git a/OpenRefine/pom.xml b/OpenRefine/pom.xml
index 8f5cba0bb..5373bb8c5 100644
--- a/OpenRefine/pom.xml
+++ b/OpenRefine/pom.xml
@@ -16,8 +16,8 @@
   </organization>
   <licenses>
     <license>
-      <name>BSD 3-Clause "New" or "Revised" License</name>
-      <url>https://github.com/OpenRefine/OpenRefine/blob/master/LICENSE.txt</url>
+      <name>BSD-3-Clause</name>
+      <url>https://raw.githubusercontent.com/OpenRefine/OpenRefine/master/LICENSE.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -55,7 +55,7 @@
 
   <properties>
     <java.minversion>11</java.minversion>
-    <java.maxversion>15</java.maxversion>
+    <java.maxversion>17</java.maxversion>
     <jee.path>/</jee.path>
     <jee.port>3333</jee.port>
     <refine.data>/tmp/refine</refine.data>
@@ -63,15 +63,15 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- dependency versions -->
-    <jackson.version>2.13.0</jackson.version>
+    <jackson.version>2.13.1</jackson.version>
     <servlet-api.version>4.0.1</servlet-api.version>
-    <butterfly.version>1.2.0</butterfly.version>
-    <slf4j.version>1.7.32</slf4j.version>
+    <butterfly.version>1.2.3</butterfly.version>
+    <slf4j.version>1.7.35</slf4j.version>
+    <log4j.version>2.17.1</log4j.version>
     <jetty.version>9.4.41.v20210516</jetty.version>
     <okhttp.version>4.9.3</okhttp.version>
-    <jena.version>4.3.1</jena.version>
-    <poi.version>5.1.0</poi.version>
-    <powermock.version>2.0.9</powermock.version>
+    <jena.version>4.3.2</jena.version>
+    <poi.version>5.2.0</poi.version>
     <commons-lang3.version>3.12.0</commons-lang3.version>
     <commons-fileupload.version>1.4</commons-fileupload.version>
     <commons-collections.version>3.2.2</commons-collections.version>
@@ -83,7 +83,7 @@
     <velocity.version>1.5</velocity.version>
     <marc4j.version>2.9.2</marc4j.version>
     <jsoup.version>1.14.2</jsoup.version>
-    <odfdom-java.version>0.10.0</odfdom-java.version>
+    <odfdom-java.version>0.9.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->
     <vicino.version>1.2</vicino.version>
     <clojure.version>1.10.3</clojure.version>
     <httpclient.version>4.5.13</httpclient.version>
@@ -99,21 +99,22 @@
     <httpmime.version>4.5.13</httpmime.version>
     <owasp-encoder.version>1.2.3</owasp-encoder.version>
     <jasypt.version>1.9.3</jasypt.version>
-    <mockito.version>4.1.0</mockito.version>
+    <mockito.version>4.3.1</mockito.version>
 
     <!-- plugin versions -->
-    <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
-    <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+    <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
+    <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
     <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
     <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
     <maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
     <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
     <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
     <surefire.version>2.22.2</surefire.version>
-    <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+    <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
     <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-    <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
+    <maven-deploy-plugin.version>3.0.0-M2</maven-deploy-plugin.version>
+    <license-plugin.version>2.0.0</license-plugin.version>
   </properties>
 
 
@@ -314,6 +315,22 @@
             <deployAtEnd>true</deployAtEnd>
 	 </configuration>
        </plugin>
+      <plugin>
+        <groupId>net.revelc.code.formatter</groupId>
+        <artifactId>formatter-maven-plugin</artifactId>
+        <version>2.17.0</version>
+        <configuration>
+          <configFile>${maven.multiModuleProjectDirectory}/IDEs/eclipse/Refine.style.xml</configFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.10</version>
+        <configuration>
+          <workspaceCodeStylesURL>${maven.multiModuleProjectDirectory}/IDEs/eclipse/Refine.style.xml</workspaceCodeStylesURL>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/OpenRefine/refine b/OpenRefine/refine
old mode 100644
new mode 100755
index 8be0070d7..c80f934ba
--- a/OpenRefine/refine
+++ b/OpenRefine/refine
@@ -54,6 +54,9 @@ where [options] include:
 
   -x <name=value> additional configuration parameters to pass to OpenRefine
      default: [none]
+
+  -c <path> path to refine.ini file
+     default: ./refine.ini
   
   --debug enable JVM debugging (on port 8000)
        
@@ -305,7 +308,7 @@ tools_prepare() {
 mvn_prepare() {
     tools_prepare
 
-    MVN_VERSION="3.8.3"
+    MVN_VERSION="3.8.4"
     MVN_URL="https://dlcdn.apache.org/maven/maven-3/${MVN_VERSION}/binaries/apache-maven-${MVN_VERSION}-bin.tar.gz"
     MVN_FILE=`echo $MVN_URL | sed 's|.*/||'`
     MVN_DIR="apache-maven-${MVN_VERSION}"
@@ -623,9 +626,7 @@ run() {
     CLASSPATH="$REFINE_CLASSES_DIR${SEP}$REFINE_LIB_DIR/*"
 
     RUN_CMD=("$JAVA" -cp "$CLASSPATH" "${OPTS[@]}" "com.google.refine.Refine")
-    echo "${RUN_CMD[@]}"
 
-    echo "Starting OpenRefine at 'http://${REFINE_HOST_INTERNAL}:${REFINE_PORT}/'"
     echo ""
 
     if [ -z "$FORK" ] ; then
@@ -804,15 +805,6 @@ if [ "$OS" = "windows" ] ; then
     SEP=";" 
 fi
 
-# ----- Load configurations -------------------------------------
-
-if [ -f "refine-dev.ini" ]; then
-  echo "Using refine-dev.ini for configuration"
-  load_configs refine-dev.ini
-else
-  echo "Using refine.ini for configuration"
-  load_configs refine.ini
-fi
 
 # ----- Make sure there is an appropriate java environment is available -------------
 
@@ -850,6 +842,7 @@ while [ $# -ne 0 ] ; do
     -k) shift; REFINE_GOOGLE_API_KEY="$1"; shift; continue;;
     -v) shift; REFINE_VERBOSITY="$1"; shift; continue;;
     -x) shift; REFINE_EXTRA_OPTS="$1"; shift; continue;;
+    -c) shift; REFINE_INI_PATH="$1"; shift; continue;;
     --debug) shift; add_option '-Xdebug' '-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n'; continue;;
     --jmx) shift; add_option '-Dcom.sun.management.jmxremote'; continue;;
     -*) fail "Invalid option: $1";;
@@ -865,6 +858,15 @@ if [ -z "$ACTION" ] ; then
     ACTION="run"
 fi
 
+# ----- Load configurations -------------------------------------
+
+if [ -z $REFINE_INI_PATH ]; then
+  REFINE_INI_PATH=refine.ini
+fi
+
+echo "Using ${REFINE_INI_PATH} for configuration"
+load_configs $REFINE_INI_PATH
+
 # ----- Verify and Set Required Environment Variables -------------------------
 
 if [ -z "$JAVA_OPTIONS" ] ; then
@@ -887,10 +889,12 @@ elif [ "$OS" = "linux" ] ; then
     freeRam=$(free -m | grep -oP '\d+' | head -n 1)
 fi
 
+echo "-------------------------------------------------------------------------------------------------"
 echo You have "$freeRam"M of free memory. 
 echo Your current configuration is set to use $REFINE_MEMORY of memory.
 echo OpenRefine can run better when given more memory. Read our FAQ on how to allocate more memory here:
-echo https://github.com/OpenRefine/OpenRefine/wiki/FAQ-Allocate-More-Memory
+echo https://docs.openrefine.org/manual/installing\#increasing-memory-allocation
+echo "-------------------------------------------------------------------------------------------------"
 
 if [ -z "$REFINE_MAX_FORM_CONTENT_SIZE" ] ; then
     REFINE_MAX_FORM_CONTENT_SIZE="1048576"
@@ -1002,4 +1006,4 @@ case "$ACTION" in
   *) usage; ;;
 esac
 
-# ----------- end of file --------------------
+# ----------- end of file --------------------
\ No newline at end of file
diff --git a/OpenRefine/refine.bat b/OpenRefine/refine.bat
index 6bab531f0..51c08da62 100644
--- a/OpenRefine/refine.bat
+++ b/OpenRefine/refine.bat
@@ -1,4 +1,5 @@
-@echo off
+
+
 rem
 rem Configuration variables
 rem
@@ -44,6 +45,9 @@ echo     default: 1400M
 echo.
 echo  "/x" enable JMX monitoring (for jconsole and friends)
 echo.
+echo  "/c <path>" path to the refine.ini file
+echo     default .\refine.ini
+echo.
 echo "and <action> is one of
 echo.
 echo   build ..................... Build OpenRefine
@@ -65,23 +69,8 @@ goto end
 
 :endUtils
 
-rem --- Read ini file -----------------------------------------------
-
 set OPTS=
 
-if exist refine-dev.ini goto readDevConfig
-echo Using refine.ini for configuration
-for /f "tokens=1,* delims==" %%a in (refine.ini) do (
-    set %%a=%%b
-)
-goto endConfigReading
-
-:readDevConfig
-echo Using refine-dev.ini for configuration
-for /f "tokens=1,* delims==" %%a in (refine-dev.ini) do (
-    set %%a=%%b
-)
-
 :endConfigReading
 
 rem --- Check JAVA_HOME ---------------------------------------------
@@ -100,7 +89,7 @@ goto fail
 rem --- Argument parsing --------------------------------------------
 
 :loop
-if ""%1"" == """" goto endArgumentParsing
+if ""%1"" == """" goto readIniFile
 if ""%1"" == ""/?"" goto usage
 if ""%1"" == ""/h"" goto usage
 if ""%1"" == ""/p"" goto arg-p
@@ -110,7 +99,8 @@ if ""%1"" == ""/w"" goto arg-w
 if ""%1"" == ""/d"" goto arg-d
 if ""%1"" == ""/m"" goto arg-m
 if ""%1"" == ""/x"" goto arg-x
-goto endArgumentParsing
+if ""%1"" == ""/c"" goto arg-c
+goto readIniFile
 
 :arg-p
 set REFINE_PORT=%2
@@ -141,11 +131,29 @@ goto shift2loop
 set OPTS=%OPTS% -Dcom.sun.management.jmxremote
 goto shift2loop
 
+:arg-c
+set REFINE_INI_PATH=%~2
+goto shift2loop
+
 :shift2loop
 shift
 shift
 goto loop
 
+:readIniFile
+
+rem --- Read ini file -----------------------------------------------
+
+if "%REFINE_INI_PATH%" == "" set REFINE_INI_PATH=refine.ini
+if not exist %REFINE_INI_PATH% (
+	echo The system cannot find the file %REFINE_INI_PATH%
+	exit /B 1
+)
+echo Using %REFINE_INI_PATH% for configuration
+for /f "tokens=1,* delims==" %%a in (%REFINE_INI_PATH%) do (
+    set %%a=%%b
+)
+
 :endArgumentParsing
 
 rem --- Fold in Environment Vars --------------------------------------------
diff --git a/OpenRefine/server/lib-local/native/windows/jdatapath.dll b/OpenRefine/server/lib-local/native/windows/jdatapath.dll
old mode 100644
new mode 100755
diff --git a/OpenRefine/server/pom.xml b/OpenRefine/server/pom.xml
index 841a9215b..fd991552a 100644
--- a/OpenRefine/server/pom.xml
+++ b/OpenRefine/server/pom.xml
@@ -178,14 +178,24 @@
       <version>${butterfly.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <version>${log4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
+    <dependency> <!-- used in Refine.java, but apparently also needed by velocity? -->
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-1.2-api</artifactId>
+      <version>${log4j.version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/OpenRefine/server/src/com/google/util/logging/IndentingLayout.java b/OpenRefine/server/src/com/google/util/logging/IndentingLayout.java
index 8ad65b34c..d57603066 100644
--- a/OpenRefine/server/src/com/google/util/logging/IndentingLayout.java
+++ b/OpenRefine/server/src/com/google/util/logging/IndentingLayout.java
@@ -1,5 +1,7 @@
 package com.google.util.logging;
 
+import java.nio.charset.Charset;
+
 /*
  * Copyright (c) Massachusetts Institute of Technology, 2007 
  *
@@ -34,8 +36,13 @@ package com.google.util.logging;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.LoggingEvent;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Node;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.core.layout.AbstractStringLayout;
 
 /**
  * This is a special Log4j log formatter that is capable of reacting on special log messages
@@ -43,23 +50,29 @@ import org.apache.log4j.spi.LoggingEvent;
  * and see what calls what. An example of logs are "> method()" and "< method()" where > and <
  * are used to indicate respectively "entering" and "exiting".
  */
-public class IndentingLayout extends Layout {
+@Plugin(name = "IndentingLayout", elementType = Layout.ELEMENT_TYPE, category = Node.CATEGORY, printObject = true)
+public class IndentingLayout extends AbstractStringLayout {
 
-    protected static final int CONTEXT_SIZE = 25;
+    protected IndentingLayout(Charset charset) {
+		super(charset);
+	}
+    
+    @PluginFactory
+    public static IndentingLayout createLayout(@PluginAttribute(value = "charset", defaultString = "UTF-8") Charset charset) {
+        return new IndentingLayout(charset);
+    }
+
+	protected static final int CONTEXT_SIZE = 25;
     protected static final long MAX_DELTA = 10000;
 
     protected Calendar calendar = Calendar.getInstance();
     protected long previousTime = 0;
     protected int indentation = 0;
 
-    @Override
-    public void activateOptions() {
-        // no options at this time
-    }
 
-    @Override
-    public String format(LoggingEvent event) {
-        String message = event.getRenderedMessage();
+	@Override
+	public String toSerializable(LogEvent event) {
+        String message = event.getMessage().getFormattedMessage();
         if (message == null) {
             return "";
         }
@@ -123,7 +136,7 @@ public class IndentingLayout extends Layout {
         buf.append(millis);
 
         buf.append(" [");
-        String context = ((String) event.getMDC("LogEvent"));
+        String context = event.getLoggerName();
         if (context == null) {
             context = event.getLoggerName();
         }
@@ -157,8 +170,4 @@ public class IndentingLayout extends Layout {
         }
     }
 
-    @Override
-    public boolean ignoresThrowable() {
-        return true;
-    }
 }
diff --git a/OpenRefine/server/src/log4j2.properties b/OpenRefine/server/src/log4j2.properties
new file mode 100644
index 000000000..60706f0b6
--- /dev/null
+++ b/OpenRefine/server/src/log4j2.properties
@@ -0,0 +1,41 @@
+status = error
+name = Log4j2PropertiesConfig
+packages = com.google.refine.logging
+ 
+appenders = console
+ 
+appender.console.type = Console
+appender.console.name = LogToConsole
+appender.console.layout.type = IndentingLayout
+#appender.console.layout.pattern = %d [%t] %-5p %c - %m%n
+
+rootLogger.level = info
+rootLogger.appenderRefs = stdout
+rootLogger.appenderRef.stdout.ref = LogToConsole
+
+logger.butterfly.name = butterfly
+logger.butterfly.level = error
+
+logger.refine.name = refine
+logger.refine.level = info
+
+logger.FileProjectManager.name = FileProjectManager
+logger.FileProjectManager.level = warn
+
+logger.velocity.name = velocity
+logger.velocity.level = warn
+
+logger.org_eclipse_log.name = org.eclipse.log
+logger.org_eclipse_log.level = warn
+
+logger.org_eclipse_jetty.name = org.eclipse.jetty
+logger.org_eclipse_jetty.level = error
+
+logger.org_apache_http_headers.name = org.apache.http.headers
+logger.org_apache_http_headers.level = warn
+
+logger.org_apache_http_impl.name = org.apache.http.impl
+logger.org_apache_http_impl.level = warn
+
+logger.org_apache_http_client.name = org.apache.http.client
+logger.org_apache_http_client.level = warn
diff --git a/OpenRefine/start.sh b/OpenRefine/start.sh
deleted file mode 100644
index 3186cd56e..000000000
--- a/OpenRefine/start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo 'Starting open refine'
-read -p "Enter IP Address [Default 127.0.0.1]: " ip
-ip=${ip:-127.0.0.1}
-nohup ./refine -i $ip > open-refine.log 2>&1 &
-echo "Started Open-Refine on" $ip
-echo "open refine started, check log through -> tail -f open-refine.log"
diff --git a/OpenRefine/stop.sh b/OpenRefine/stop.sh
deleted file mode 100644
index dc6c85e34..000000000
--- a/OpenRefine/stop.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ps -ef | grep refine | awk '{print $2}' | awk 'NR==1' | xargs kill
-echo 'successfully stopped open-refine'