Changes in test folders structure.

R.