Merge testing into the same repository.
A little bit of cleaning.