Restructure testing hierarchy

[simonech]

Now all test are a bit mixed. Would be better to split the various files in merging and extraction