Fix specs depending on relocator to work correctly on test env
Split tests in 8 files
Merge branch 'master' into CDB-3473