Refactoring + harmonisation tests.