import tests

Fix tests to support correctly unit.
Check that the tests of merge-5.1 integration are green